| commit | bf54a8af3b9abdb98b6b8398df692d65714c5141 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Mar 18 15:49:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 18 15:49:36 2015 +0000 |
| tree | 16b4282815477f58fbbe5e0190dc9f61b11298e4 | |
| parent | 77a7308dd1c8335cf3c5ffce0b2cd6a74ca1e46e [diff] | |
| parent | 3b419c0f5c870960b11c9fde81e9eb8ea8976aad [diff] |
am 3b419c0f: (-s ours) am c0ca0de7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit '3b419c0f5c870960b11c9fde81e9eb8ea8976aad': Import translations. DO NOT MERGE