resolved conflicts for merge of f85aa9ef to gingerbread-plus-aosp
authorSteve Howard <showard@google.com>
Fri, 30 Jul 2010 18:39:28 +0000 (11:39 -0700)
committerSteve Howard <showard@google.com>
Fri, 30 Jul 2010 18:39:28 +0000 (11:39 -0700)
commit915912de0373b78de4cd7cc1f45dad760ef94243
tree0cecd760b984442f18dd780923c8ed5b4d06e464
parent7a8bf08fe936a1fdb0408dea1ec2f39b83acc5d7
parentf85aa9ef563f2fbb3c0db6c980121122a14d953f
resolved conflicts for merge of f85aa9ef to gingerbread-plus-aosp

Change-Id: I0adb03f16a6f0cc648886e02c79ffde63e18f99f
src/com/android/providers/downloads/DownloadThread.java