summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-12-01 19:47:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-01 19:47:39 +0000
commit2fd61cfbc12d9b20b9bde75dcb9381449b80d72e (patch)
tree9b47b3a874c0c2848aaecf33614be35ea83eb878 /res
parent193c7f9b94efb207d8104abdfa81e99576f16b52 (diff)
parentd48e7b859cb39f12b9f8ab4c7c7eccd3e6581049 (diff)
am d48e7b85: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'd48e7b859cb39f12b9f8ab4c7c7eccd3e6581049': Import translations. DO NOT MERGE
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions