summaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-10-18 10:31:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-18 10:31:03 -0700
commitc2c87a02f42b8a9b4f419df72617c0c1ab6d5756 (patch)
tree9ca2034a96861dd94a76a801c3aa5b518bf7a8c3 /tests/src
parentd1140df2630b5a262efa1cbf4cb3361d0dd56aa8 (diff)
parent1b831d75cec0f75f4bdbaac2a77053da93d5cb2d (diff)
downloadandroid_packages_providers_DownloadProvider-c2c87a02f42b8a9b4f419df72617c0c1ab6d5756.tar.gz
android_packages_providers_DownloadProvider-c2c87a02f42b8a9b4f419df72617c0c1ab6d5756.tar.bz2
android_packages_providers_DownloadProvider-c2c87a02f42b8a9b4f419df72617c0c1ab6d5756.zip
am 1b831d75: (-s ours) am 4c1acb60: Merge "Import revised translations DO NOT MERGE" into gingerbread
Merge commit '1b831d75cec0f75f4bdbaac2a77053da93d5cb2d' * commit '1b831d75cec0f75f4bdbaac2a77053da93d5cb2d': Import revised translations DO NOT MERGE
Diffstat (limited to 'tests/src')
0 files changed, 0 insertions, 0 deletions