summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-10-20 22:39:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-20 22:39:34 +0000
commit086c987e15addb569ba061418d0c79568013fc79 (patch)
tree8b5fed58742e68368370b349cd081491e1e894c6 /res
parent7b37fe754cd3dfd36abf74171f5a517112eae575 (diff)
parent3333393036906207ad388f00d15dda3bf46b9633 (diff)
am 33333930: (-s ours) am 844b1532: (-s ours) am 2c373272: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '3333393036906207ad388f00d15dda3bf46b9633': Import translations. DO NOT MERGE
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions