summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-11-19 15:40:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-19 15:40:34 +0000
commit78ab71eca0b8562fe280eae9ad8744c620de1ebc (patch)
tree7dbf140631a78d1664b1e161be3f39653b4548d2 /res
parent13d3b38e5720fb976c55eb5a53e061c05511de55 (diff)
parent91024f55de91db0d9124605b0bedf778fb65c6ae (diff)
am 91024f55: (-s ours) am d896f661: (-s ours) am 4dbd3a23: (-s ours) Import translations. DO NOT MERGE
* commit '91024f55de91db0d9124605b0bedf778fb65c6ae': Import translations. DO NOT MERGE
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions