| commit | 05f11de602bca04ce366725e63f1b65e9a341a06 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Aug 14 03:18:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 14 03:18:34 2015 +0000 |
| tree | 95f0822ba83e68204ef27a3bb312561a7214df5b | |
| parent | d10bfee7280f2eb34348476884370d4dd06e1038 [diff] | |
| parent | 1ed75a0569b8ece86fe96eb4340cffb181f6765b [diff] |
am 1ed75a05: (-s ours) am ca74f32c: (-s ours) am 3fc785ce: (-s ours) am 762b4fd8: (-s ours) Import translations. DO NOT MERGE * commit '1ed75a0569b8ece86fe96eb4340cffb181f6765b': Import translations. DO NOT MERGE