| commit | ac572525dfe2664bc2bd4fea510c3ca5e600648a | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Jul 06 18:12:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 06 18:12:38 2014 +0000 |
| tree | 4858d9ac57410a2c4b2984eb831d6f99fde1a720 | |
| parent | 200e21c58996d76eb16e85963ca6c44770f9db05 [diff] | |
| parent | e885a9ca9b54aec74dc78de1fab0f2efeb910046 [diff] |
am e885a9ca: (-s ours) am eb17f6ab: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'e885a9ca9b54aec74dc78de1fab0f2efeb910046': Import translations. DO NOT MERGE