| commit | 15aca0aa6db5517c14d973f096aaf12e6930c681 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Jun 23 17:27:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 23 17:27:53 2014 +0000 |
| tree | 624cff6899a2bec0f9a52ac6ea8501828e134826 | |
| parent | 96e98d4170ee5f601be999a63e88db41c2bbb01f [diff] | |
| parent | 858b47ca1eb9bc7d5efe183018a4053dd4d068ca [diff] |
am 858b47ca: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '858b47ca1eb9bc7d5efe183018a4053dd4d068ca': Import translations. DO NOT MERGE