commit | ecc6f3fb8926877ea0a55568fca5b2e7d4da13e5 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Jan 07 00:44:52 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 07 00:44:52 2014 +0000 |
tree | 49331011f82e614c6c01fe449cd893e756d92fc4 | |
parent | 927d1602b1cbcd0843b31830f1de4a0cd69b3a6d [diff] | |
parent | ff1f1c452ceebd0502a5ad4110446cb0b768a6e9 [diff] |
am ff1f1c45: (-s ours) am 24c2980c: (-s ours) am be24e41b: (-s ours) am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'ff1f1c452ceebd0502a5ad4110446cb0b768a6e9': Import translations. DO NOT MERGE