summaryrefslogtreecommitdiff
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-10-06 22:31:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-06 22:31:05 +0000
commit8ba957f15593347ab800388a4013a0d7b38ad097 (patch)
treef9eb3a48c6339f9cd744cd98fa184bb54a9244d6 /AndroidManifest.xml
parente93eb58ef0ed89f3977802518c145f36c0894499 (diff)
parent13db18325d7f10f08df5e54759389a8e023fb2f0 (diff)
am 13db1832: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '13db18325d7f10f08df5e54759389a8e023fb2f0': Import translations. DO NOT MERGE
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions