| commit | 36ccaf89663358f99a2559d07ec15aef59416f08 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Aug 17 14:21:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 17 14:21:26 2014 +0000 |
| tree | 7ba9002362cf777ebc6613be02ecc663823ed2e6 | |
| parent | 934ab0617ae8fe743fe4ffea5eac71690afb68da [diff] | |
| parent | bf604f28529a8d08730721e4e0452f142e3d2bec [diff] |
am bf604f28: (-s ours) am bb10598e: (-s ours) am d9b329ba: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'bf604f28529a8d08730721e4e0452f142e3d2bec': Import translations. DO NOT MERGE