commit | 7e31360dc966ebbaf91d276808a62265d55245c1 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Sep 16 18:22:28 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 18:22:28 2014 +0000 |
tree | 5fc024fbda4e9816cbf71f5bb0d9ae4ecb6fc6d2 | |
parent | f6abe65a3b40b35eb8e44681f365e53eb9726ce6 [diff] | |
parent | 12e57c5a720ef3f22b690fc65e13dde67e271959 [diff] |
am 12e57c5a: (-s ours) am b8ca040c: (-s ours) am b979cd54: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '12e57c5a720ef3f22b690fc65e13dde67e271959': Import translations. DO NOT MERGE