| commit | 7a0c7c5af04eb9e046a9b705695a4cba97008851 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Sep 18 18:25:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 18 18:25:59 2014 +0000 |
| tree | 585f57ab45d3ddbb2f13b08be53703d1ca6a7ecf | |
| parent | b90edb9a0458f19157f2b20920be550cdc7f1230 [diff] | |
| parent | 995537dc0952b298b4e09f78a498b44b7becbca3 [diff] |
am 05cc6a93: (-s ours) am dcf14618: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '05cc6a938b5fc92bb6250313335aa078d735ec2b': Import translations. DO NOT MERGE