| commit | 97735297307eccc3cedb537fe88a2a76d473f798 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Mar 04 13:47:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 04 13:47:46 2015 +0000 |
| tree | 7d5baa6fdc44257dc28edef4cc78070ea8293bc7 | |
| parent | 89a2b286ae69858a999d050ac30fdf171dee6d1c [diff] | |
| parent | 42796e97f64ee7ab3dafaf2daf9ebbc2f35030a2 [diff] |
am 42796e97: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit '42796e97f64ee7ab3dafaf2daf9ebbc2f35030a2': Import translations. DO NOT MERGE