| commit | 2fc09a0d36517d16ef766698a7f5121a29cd7cdf | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Aug 22 18:58:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 22 18:58:25 2014 +0000 |
| tree | 7355cf2ed7edd48fc922bfc44cced1aa45ef2f04 | |
| parent | 14f66ff1560e8cdd5ba565d9b11bffdb0065bc26 [diff] | |
| parent | 7d28ff47a46ebd5c065f26778a21ef1db6a90e0b [diff] |
am 7d28ff47: (-s ours) am 593a663f: (-s ours) am 9821a0ab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '7d28ff47a46ebd5c065f26778a21ef1db6a90e0b': Import translations. DO NOT MERGE