commit | 0c0c0e4a267d41d66382c6d070cbea98f2407b47 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Dec 19 05:57:30 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 19 05:57:30 2013 +0000 |
tree | 1c79f3ec7ab815dc4d0810de01740465f0667209 | |
parent | dc9197eecd50b61d0752c70c48a5d09641c55287 [diff] | |
parent | 48b5f4b17677c60f6a2ff75bcc50a56182371b07 [diff] |
am 48b5f4b1: (-s ours) am 73a2208d: (-s ours) am b158819d: (-s ours) am 2e371ee1: (-s ours) am c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '48b5f4b17677c60f6a2ff75bcc50a56182371b07': Import translations. DO NOT MERGE