am 918f819a: resolved conflicts for merge of b5629da7 to gingerbread-plus-aosp
authorSteve Howard <showard@google.com>
Wed, 21 Jul 2010 20:05:50 +0000 (13:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 21 Jul 2010 20:05:50 +0000 (13:05 -0700)
commit5f33f029b35bd10533cb77a0a8589325100f408a
tree3a4c42db8974a95dbfef95dbcf5791c4579a4038
parentfc39c8453c62989f8c8f615278badf6337ec003f
parent918f819abfb1da3661c1c604440666655e0c8909
am 918f819a: resolved conflicts for merge of b5629da7 to gingerbread-plus-aosp

Merge commit '918f819abfb1da3661c1c604440666655e0c8909'

* commit '918f819abfb1da3661c1c604440666655e0c8909':
  Major refactoring of DownloadThread.run().
src/com/android/providers/downloads/DownloadProvider.java