diff options
author | Baligh Uddin <baligh@google.com> | 2014-03-20 19:12:58 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 19:12:58 +0000 |
commit | ad1d1aac132791b942064ede26103c714d20d7e3 (patch) | |
tree | 0de18780b61f01a892da197f6b2ca9ddfe2e0603 | |
parent | 134eee180ffdd9d4cad2db6228056b02156872ae (diff) | |
parent | 7b9c7ea08e9e1f02dc6811e54802c2d63a2cedea (diff) |
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 '7b9c7ea08e9e1f02dc6811e54802c2d63a2cedea':
Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions