| commit | 2dae166977a9cea6f49c6d1ecaf50415bb01088f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:53:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:53:19 2015 +0000 |
| tree | 547117f668ea31f8424844206e27f34c81ed9547 | |
| parent | 8bcfdb707fb4ac8c44ec1f2c7483e35d5854e295 [diff] | |
| parent | d9662ac615b0d5ac1edcbaab6ddd202edc743195 [diff] |
am d9662ac6: (-s ours) Import translations. DO NOT MERGE * commit 'd9662ac615b0d5ac1edcbaab6ddd202edc743195': Import translations. DO NOT MERGE