| commit | 4489933b703f591f5f8366b07159e3a918c7d3fa | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Oct 05 17:58:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 05 17:58:24 2014 +0000 |
| tree | bc537f0f6e09822c8f30d7952acf2a159a7edf4d | |
| parent | 36ec328d5cd9e569b532b77a3f9f4bc7cb6bbde4 [diff] | |
| parent | 194f0e1baac02dfc0886f6d09605348151a34f31 [diff] |
am 194f0e1b: (-s ours) am 334c6232: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '194f0e1baac02dfc0886f6d09605348151a34f31': Import translations. DO NOT MERGE