resolved conflicts for merge of 3d55d829 to gingerbread-plus-aosp
authorSteve Howard <showard@google.com>
Thu, 16 Sep 2010 20:58:30 +0000 (13:58 -0700)
committerSteve Howard <showard@google.com>
Thu, 16 Sep 2010 20:58:30 +0000 (13:58 -0700)
commit176a74426f750dc56e7d200a4cdc3b6ed75fe6cd
tree5e83e23318b22ce2877186a5b0aa9ab93978d4b7
parent57df1b6a7219e049371cae72b36a63d04e214f59
parent3d55d829c03fe78ad8cdab119293efb6c6e49c64
resolved conflicts for merge of 3d55d829 to gingerbread-plus-aosp

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