summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-06-15 13:20:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-15 13:20:46 +0000
commitc4a86230a6940fdf03f9aa8678668fedf9cce607 (patch)
tree84cc2db352a26d4f212c10a47b59e8d4d69c1f89 /res
parentadcafb23855a68b87c4761806ef70296338cc826 (diff)
parentd85642de21171407695f570a2823dfdf5022a5f8 (diff)
am d85642de: (-s ours) am d5196402: (-s ours) am efd4c293: (-s ours) Import translations. DO NOT MERGE
* commit 'd85642de21171407695f570a2823dfdf5022a5f8': Import translations. DO NOT MERGE
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions