diff options
author | Baligh Uddin <baligh@google.com> | 2014-03-27 23:16:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-27 23:16:48 +0000 |
commit | 82c09c82b3baac3be7f972b0f0a6f90e74f923a8 (patch) | |
tree | 8d2f5c22f54088be3981b01587ece4461009be94 /res | |
parent | f9fba9fdf3053f356d3a129198d95903beb3b1d0 (diff) | |
parent | ab3f2492401aa63d73fbf4de9068ee2281f2d98f (diff) |
am ab3f2492: (-s ours) am 1bc53e63: (-s ours) am e7a64624: (-s ours) am adff3f1f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'ab3f2492401aa63d73fbf4de9068ee2281f2d98f':
Import translations. DO NOT MERGE
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions