| commit | eda140e7203c66863690c2d96d28ec56c954dae4 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Aug 22 18:43:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 22 18:43:04 2014 +0000 |
| tree | 7baf90f085e50f0e186fc5fb455e97631975bf9d | |
| parent | c1b6b83981fa6011ba6139fd45e916416e2678b7 [diff] | |
| parent | 309b125340fd0d68c5c054e65fc9672d1d4ed404 [diff] |
am 309b1253: (-s ours) am 01408739: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '309b125340fd0d68c5c054e65fc9672d1d4ed404': Import translations. DO NOT MERGE