summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-12-01 17:11:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-01 17:11:22 +0000
commite8f7e8d6a0413e39fbcd18c7dedf7898e304b999 (patch)
tree722afd5f3eb8e540f8beedffeb63eebb14be532f /res
parentd48e7b859cb39f12b9f8ab4c7c7eccd3e6581049 (diff)
parent5bba5aea8eef1567697e7d90ceb53f2366a2cecf (diff)
am 5bba5aea: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '5bba5aea8eef1567697e7d90ceb53f2366a2cecf': Import translations. DO NOT MERGE
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions