| commit | a559f2af166a25b724040961f4e8402053170c71 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Jun 23 19:45:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 23 19:45:48 2014 +0000 |
| tree | 12c1452965390babd4008e76224a43f87e24970d | |
| parent | 8187d55bba3a51f51e75994f131ed1734acab59d [diff] | |
| parent | 15aca0aa6db5517c14d973f096aaf12e6930c681 [diff] |
am 15aca0aa: (-s ours) am 858b47ca: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '15aca0aa6db5517c14d973f096aaf12e6930c681': Import translations. DO NOT MERGE