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