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