| commit | 9e3dcfa25fbee993cc15ee819df9cf828bff8a57 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Jun 20 19:57:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 20 19:57:15 2014 +0000 |
| tree | 653726e374c4f6126caaa7ea64a0d82425c93d1a | |
| parent | 922d0e7963228656081e3c100f34be84e43c14e1 [diff] | |
| parent | 1c74e20db1c59fdb4e9512339c1251830842c905 [diff] |
am 1c74e20d: (-s ours) am 1b3a5217: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '1c74e20db1c59fdb4e9512339c1251830842c905': Import translations. DO NOT MERGE