resolved conflicts for merge of b108a273 to gingerbread-plus-aosp
authorSteve Howard <showard@google.com>
Thu, 30 Sep 2010 18:21:33 +0000 (11:21 -0700)
committerSteve Howard <showard@google.com>
Thu, 30 Sep 2010 18:21:33 +0000 (11:21 -0700)
commited2f11502fb02509d9efec1dbda7981c86f37fbd
tree467f7b0b9f21386af52eaf7f2555b2642a131538
parent6a52fa33f34e3a994881801787cb012eaef8b4ce
parentb108a273b150e81bf26553b8851d6241bc711f98
resolved conflicts for merge of b108a273 to gingerbread-plus-aosp

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