summaryrefslogtreecommitdiffstats
path: root/docs/html/tools/testing
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-10-31 17:14:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-31 17:14:23 +0000
commitd9aa0fb33a67b0bb4e1bc66fa850188cda7eed89 (patch)
tree1334856479a7668f324d567e998d014d2b71096e /docs/html/tools/testing
parentc5e57877d52e151215c5ef4f1f10b5ff878b5beb (diff)
parent4203242f223084fa8bd4459fa60e95be4dae659e (diff)
downloadframeworks_base-d9aa0fb33a67b0bb4e1bc66fa850188cda7eed89.zip
frameworks_base-d9aa0fb33a67b0bb4e1bc66fa850188cda7eed89.tar.gz
frameworks_base-d9aa0fb33a67b0bb4e1bc66fa850188cda7eed89.tar.bz2
am 4203242f: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '4203242f223084fa8bd4459fa60e95be4dae659e': Import translations. DO NOT MERGE
Diffstat (limited to 'docs/html/tools/testing')
0 files changed, 0 insertions, 0 deletions