| commit | 1aca6e04f54cd2144a8acb8fb26e87afe93a42e3 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Nov 06 20:02:27 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 06 20:02:27 2013 -0800 |
| tree | 1c8020f3024f3865999f70632dcfe74426a48630 | |
| parent | a7756cbc62d19bef22c99990043621086f731b25 [diff] | |
| parent | 6695fa52994fcf43f80cf5142eeacd37d5a6094d [diff] |
am 6695fa52: (-s ours) am 5be3186b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '6695fa52994fcf43f80cf5142eeacd37d5a6094d': Import translations. DO NOT MERGE