summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-11-19 15:37:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-19 15:37:07 +0000
commit91024f55de91db0d9124605b0bedf778fb65c6ae (patch)
tree1ccc64274562901c7ab1a335dc79a3061628d55d /res
parent9942a7619f4c2371c8b802a3f4107b7d35d6665c (diff)
parentd896f661e370b59fae65b9be6ce52c88e9fb4a42 (diff)
am d896f661: (-s ours) am 4dbd3a23: (-s ours) Import translations. DO NOT MERGE
* commit 'd896f661e370b59fae65b9be6ce52c88e9fb4a42': Import translations. DO NOT MERGE
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions