summaryrefslogtreecommitdiffstats
path: root/test-runner/src/android
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-10-01 05:31:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-01 05:31:30 +0000
commit3e9bf6c69330d3e9b0f3d9424814b307532a64e9 (patch)
treeaaf126e46cae3b42af37b4767f480bcbadc7d608 /test-runner/src/android
parent2e459a6653f6254153005352a6fec812ce48f18d (diff)
parent3022aa2175e82cc67c51a70748ea6923876e9806 (diff)
downloadframeworks_base-3e9bf6c69330d3e9b0f3d9424814b307532a64e9.zip
frameworks_base-3e9bf6c69330d3e9b0f3d9424814b307532a64e9.tar.gz
frameworks_base-3e9bf6c69330d3e9b0f3d9424814b307532a64e9.tar.bz2
am 3022aa21: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '3022aa2175e82cc67c51a70748ea6923876e9806': Import translations. DO NOT MERGE
Diffstat (limited to 'test-runner/src/android')
0 files changed, 0 insertions, 0 deletions