| commit | 633910835fea5bf31f221acf174d5caec43ef660 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Jul 01 18:20:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 01 18:20:40 2014 +0000 |
| tree | 1bc2261e0f1a7881c5a803a49289c89b68804a1d | |
| parent | eafb6ae6a8967b3ac000649e9cbebcc56a960139 [diff] | |
| parent | b77da19e59fee9dda1177aaf312551210bcdf679 [diff] |
am b77da19e: (-s ours) am b9246ef5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit 'b77da19e59fee9dda1177aaf312551210bcdf679': Import translations. DO NOT MERGE