| commit | 1df29f0889f3615e50dd74e8138b4600528843c5 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Aug 16 04:02:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 16 04:02:30 2014 +0000 |
| tree | 298dcebf229b7d3a5284aee574a144ca11b4a4f0 | |
| parent | 144c0fe9b8dca2e3c77f5d312f23d1bc63eb9d8f [diff] | |
| parent | 7969be0bb858c2fdc69b72f7c8f90f1dcdba3395 [diff] |
am 7969be0b: (-s ours) am 5c7015d7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '7969be0bb858c2fdc69b72f7c8f90f1dcdba3395': Import translations. DO NOT MERGE