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