| commit | b4e539edc489c0d81067fcad29ed6197362ab8c2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Aug 17 13:08:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 17 13:08:12 2015 +0000 |
| tree | b1e526f46c9a6f26dfcb3d40f1496dfee4eeaf86 | |
| parent | b9324f26f10f4683f809165fe7e84150c1cd0c3d [diff] | |
| parent | ed6bee8c7b29856f3b0f2bf7c32ba04d1eeff77f [diff] |
am ed6bee8c: (-s ours) am 7804882c: (-s ours) Import translations. DO NOT MERGE * commit 'ed6bee8c7b29856f3b0f2bf7c32ba04d1eeff77f': Import translations. DO NOT MERGE