summaryrefslogtreecommitdiff
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-10-28 07:09:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-28 07:09:42 +0000
commit2ba7ad37bdaa6870a708d4c9cf050e301646c6d2 (patch)
tree9c96178c637908026d4c70e17defd936314ba2c0 /AndroidManifest.xml
parent219f1190e49c366676dc65731e42b7905d80bec3 (diff)
parent10af602941a93f1cbd808f080c9fd223d8cd6924 (diff)
am 10af6029: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '10af602941a93f1cbd808f080c9fd223d8cd6924': Import translations. DO NOT MERGE
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions