commit | c88eacaef4a66f76ad787d88a7a586b1da6d82b4 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Nov 07 16:14:07 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 07 16:14:07 2014 +0000 |
tree | 2b7e8f5017f2f8ff4e36da6de5bb8b818fa1a16c | |
parent | 3e1c8b83af157293c57ad3803340e24a1634ea8b [diff] | |
parent | 977620e8bc74e4b10441abc05e0a8509d22348f9 [diff] |
am 3cad9ae1: (-s ours) am 59bde842: (-s ours) am d8ed8060: (-s ours) am 63717687: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '3cad9ae1d210535746b0714924877d97ab8f4e34': Import translations. DO NOT MERGE