summaryrefslogtreecommitdiffstats
path: root/MODULE_LICENSE_APACHE2
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2010-05-10 17:13:18 -0400
committerSteve Kondik <shade@chemlab.org>2010-05-10 17:13:18 -0400
commit9a2c94b041f03d39cb88c1a8d4c43d7276e7f11e (patch)
tree03d52e7e5cbc95d5b2d48a83622f576bda9c275e /MODULE_LICENSE_APACHE2
parent9d28a183ff6eaa91f283b00b449250c2f711c780 (diff)
parent72f14a6f122f020e560e6572b2581c43b3ea90e3 (diff)
downloadandroid_packages_providers_DownloadProvider-9a2c94b041f03d39cb88c1a8d4c43d7276e7f11e.tar.gz
android_packages_providers_DownloadProvider-9a2c94b041f03d39cb88c1a8d4c43d7276e7f11e.tar.bz2
android_packages_providers_DownloadProvider-9a2c94b041f03d39cb88c1a8d4c43d7276e7f11e.zip
Merge branch 'master' of git://android.git.kernel.org/platform/packages/providers/DownloadProvider into eclaireclair
Conflicts: src/com/android/providers/downloads/DownloadThread.java
Diffstat (limited to 'MODULE_LICENSE_APACHE2')
0 files changed, 0 insertions, 0 deletions