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