commit | d7b1b040af9c7f796db0048045eeb7f14c8f558b | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Aug 15 16:22:14 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 15 16:22:14 2014 +0000 |
tree | f7ef605549def261b568eb8b403df8cf090ba118 | |
parent | 741bfa2c9ad080c34a41afa7741da2afd02ffb7a [diff] | |
parent | 129d0ae7aba20fe4df2eb57c0c380e31fb68e574 [diff] |
am 129d0ae7: (-s ours) am f02a9d7c: (-s ours) am cdf02ddd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '129d0ae7aba20fe4df2eb57c0c380e31fb68e574': Import translations. DO NOT MERGE