commit | 48b5f4b17677c60f6a2ff75bcc50a56182371b07 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Dec 19 05:53:19 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 19 05:53:19 2013 +0000 |
tree | 403caa947528a327d04009c23326bf7057165c6f | |
parent | ebef15bde6f4d7495c8472e2b91af29a6756f175 [diff] | |
parent | 73a2208de1f8e319686a8ae77733b88a261881b5 [diff] |
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 '73a2208de1f8e319686a8ae77733b88a261881b5': Import translations. DO NOT MERGE