| commit | 7fdb7ee70ad206c41ac4e8129efcb32f8f058cd1 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 02 09:34:50 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 02 09:34:50 2013 -0700 |
| tree | 550046b1c4f493f956b312c266e641aac8e8a1fc | |
| parent | 8c4525744a30c90ba5a17ab32aebe5af038f99dd [diff] | |
| parent | 5a9c61e36fb611ce4d78effa30a172a4a608b4e0 [diff] |
am 5a9c61e3: (-s ours) am 8f13241c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '5a9c61e36fb611ce4d78effa30a172a4a608b4e0': Import translations. DO NOT MERGE