| commit | a5f1be6fe174676db1ae50c18d43b19361e5858f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 31 17:42:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 31 17:42:59 2015 +0000 |
| tree | a30c4f1ac8f2bbe7db9cdc7853307082cf2e69b0 | |
| parent | 17e8d2645febad3557bca67055b0a9b451aee2ae [diff] | |
| parent | 97e3b5fc50f6a0e4e71c11fecaff04b8b16f3657 [diff] |
am 97e3b5fc: (-s ours) Import translations. DO NOT MERGE * commit '97e3b5fc50f6a0e4e71c11fecaff04b8b16f3657': Import translations. DO NOT MERGE