diff options
author | Steve Kondik <shade@chemlab.org> | 2010-05-10 17:13:18 -0400 |
---|---|---|
committer | Steve Kondik <shade@chemlab.org> | 2010-05-10 17:13:18 -0400 |
commit | 9a2c94b041f03d39cb88c1a8d4c43d7276e7f11e (patch) | |
tree | 03d52e7e5cbc95d5b2d48a83622f576bda9c275e /res | |
parent | 9d28a183ff6eaa91f283b00b449250c2f711c780 (diff) | |
parent | 72f14a6f122f020e560e6572b2581c43b3ea90e3 (diff) | |
download | android_packages_providers_DownloadProvider-eclair.tar.gz android_packages_providers_DownloadProvider-eclair.tar.bz2 android_packages_providers_DownloadProvider-eclair.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 'res')
0 files changed, 0 insertions, 0 deletions