| commit | 143401018a4cf6d7ad8a0baf96d74c8e9b3e40f5 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Sep 20 04:47:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 20 04:47:11 2014 +0000 |
| tree | 00ceb9008c92fd94b736c7d9c8055811343f30db | |
| parent | d77daa3297740a56797917e502fe837ba2aa46bf [diff] | |
| parent | 7da76789162c6d5e76e9563adfcef6e151bdc1f4 [diff] |
am 7da76789: (-s ours) am be132cca: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '7da76789162c6d5e76e9563adfcef6e151bdc1f4': Import translations. DO NOT MERGE