| commit | cb5ebc25fe512d90c608ca5777de258a78aa6687 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 16 13:03:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 16 13:03:56 2015 +0000 |
| tree | f571749292893ee67cd3b7fa8c8b7f1ee25fc81f | |
| parent | 1dc122067932455d1e9c79fdbe97a361d824cf96 [diff] | |
| parent | e0c0f6c2a8eae1004227f4d0a3d5f77730b29ff7 [diff] |
am e0c0f6c2: (-s ours) am 9a036229: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit 'e0c0f6c2a8eae1004227f4d0a3d5f77730b29ff7': Import translations. DO NOT MERGE