Merge commit 'korg/cupcake'
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 27 Mar 2009 22:39:32 +0000 (15:39 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 27 Mar 2009 22:39:32 +0000 (15:39 -0700)
commite0114021be2a1ca49a8cba85bb88129d3a19d173
tree8e37310aa30340464f871dbc33e5e2eba5c1f64f
parent977d38d21876fbc39598ff0a966a27db92ee1d59
parent9ae5f517f7699439b673330867b26ffc5ad880cc
Merge commit 'korg/cupcake'

Conflicts:
src/com/android/providers/downloads/DownloadThread.java
src/com/android/providers/downloads/DownloadThread.java