| commit | 5df8b42709662b0e599019e4fd17c4e153ff6b47 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 21 16:52:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 21 16:52:51 2014 +0000 |
| tree | 77ae6dc696eb7f2942e6d5bfebdccb95eebf8a6e | |
| parent | fb52c953ac98cd7751a6d49cedf99eefcf86e70f [diff] | |
| parent | aa8f178b4a8c557d553a7bfd27a22439b0465756 [diff] |
am aa8f178b: (-s ours) am cd2a75b5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'aa8f178b4a8c557d553a7bfd27a22439b0465756': Import translations. DO NOT MERGE