| commit | eeabe9eedc1ccf598355be97b306965f484f8fa9 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu May 08 21:42:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 08 21:42:00 2014 +0000 |
| tree | f10a135ce183818e05c8050a16bfd4f6b3e92af9 | |
| parent | 2f8c04574a8799a6fe33206640f35b689d52bd9a [diff] | |
| parent | ad2cfc5286c0197b3638c57701109bea9cce3e20 [diff] |
am 33c08e29: (-s ours) am 825bfb4f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '33c08e2986832fa32fc08350f946e7c2e8f2b3a6': Import translations. DO NOT MERGE