diff options
author | Baligh Uddin <baligh@google.com> | 2014-03-20 21:05:46 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 21:05:46 +0000 |
commit | 0b41f0f32c66cd7d58d2635d6b2434c467b82b2a (patch) | |
tree | 9f6248773dcf7d820ec42b83c628dfb37393c6e5 | |
parent | 6851df9e0d7188d7575bd27b74142ef44ff04de0 (diff) | |
parent | ad1d1aac132791b942064ede26103c714d20d7e3 (diff) |
am ad1d1aac: (-s ours) am 7b9c7ea0: (-s ours) am 1c0e52d6: (-s ours) am c1f2a213: (-s ours) am ea8ec3cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'ad1d1aac132791b942064ede26103c714d20d7e3':
Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions