| commit | 61e3991bf64b86de32ad24ffcf1753f0f8a80166 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Apr 17 19:36:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 17 19:36:15 2014 +0000 |
| tree | 03e2a1cf34a31ee55b4228cae02e9d9dd52f056a | |
| parent | d36e8df7241f2433233377bbc803468c91ae8ad9 [diff] | |
| parent | 177d9b9a25296d9cbe0f96497a8abf2fe28aa1da [diff] |
am 177d9b9a: (-s ours) am b279f527: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '177d9b9a25296d9cbe0f96497a8abf2fe28aa1da': Import translations. DO NOT MERGE