resolved conflicts for merge of b5629da7 to gingerbread-plus-aosp
authorSteve Howard <showard@google.com>
Wed, 21 Jul 2010 20:01:08 +0000 (13:01 -0700)
committerSteve Howard <showard@google.com>
Wed, 21 Jul 2010 20:01:08 +0000 (13:01 -0700)
commit918f819abfb1da3661c1c604440666655e0c8909
tree25916c48ddfa2023de4b292635ba51c7d97cb049
parentb607c31e50fdd08258a489b881b2ad5ff5f75d0d
parentb5629da794cb3c1ca1970d206343743b165b9644
resolved conflicts for merge of b5629da7 to gingerbread-plus-aosp

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