commit | 25b2b617f242ff3a10f207190a63b1ec3d99b76d | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Oct 02 12:40:29 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 02 12:40:29 2014 +0000 |
tree | 946b62f19b072339b4dab846ff88e74659be0cd5 | |
parent | e6b134555d370609682affbf31a5f98fffc7db3a [diff] | |
parent | a073a7d6d60058d40b3b4a617d95e73e34caeed8 [diff] |
am a073a7d6: (-s ours) am e2218a6f: (-s ours) am 778ae41f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'a073a7d6d60058d40b3b4a617d95e73e34caeed8': Import translations. DO NOT MERGE