| commit | daeb859845fa6af5f637c71c131d14f84b3d57b7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 18:17:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 18:17:37 2015 +0000 |
| tree | 7228ba5307c403204726c8ed9cb5e5a1daa3425c | |
| parent | 1a343487867242588807eabaef6e33f803990ef1 [diff] | |
| parent | 8bcfdb707fb4ac8c44ec1f2c7483e35d5854e295 [diff] |
am 8bcfdb70: (-s ours) am 82df9b72: (-s ours) am eb6babec: (-s ours) Import translations. DO NOT MERGE * commit '8bcfdb707fb4ac8c44ec1f2c7483e35d5854e295': Import translations. DO NOT MERGE