| commit | 8a18ac3d858262b93ba7270e99e25c261892bc80 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 12 23:05:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 23:05:13 2015 +0000 |
| tree | ce7cec99f0dd32e67464e93a42927f9da159c155 | |
| parent | f23a517add2ad6c587bcfa691a1ac048818a39de [diff] | |
| parent | 7c958e2df0375761a1851cd02ca3aac3ee95f1c5 [diff] |
am 7c958e2d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit '7c958e2df0375761a1851cd02ca3aac3ee95f1c5': Import translations. DO NOT MERGE