| commit | 965f543dcb3fc795a7c636c067edaa7f2c8e5545 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Nov 06 20:02:31 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 06 20:02:31 2013 -0800 |
| tree | 1c8020f3024f3865999f70632dcfe74426a48630 | |
| parent | 1aca6e04f54cd2144a8acb8fb26e87afe93a42e3 [diff] | |
| parent | 89dcc8a1160222039e60b18befe4c5e3a2bd2c41 [diff] |
am 89dcc8a1: (-s ours) am 41c2f04e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '89dcc8a1160222039e60b18befe4c5e3a2bd2c41': Import translations. DO NOT MERGE