| commit | f5250369eb99d5f2b435be845b5bb19a531538bb | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 08 13:56:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 13:56:13 2015 +0000 |
| tree | 3e2e58786bf1e70a3889fde2adcb79c494b0080d | |
| parent | 9d661beb7a7228e8fab6aa0c2e34a74b18214725 [diff] | |
| parent | 38db5220aef61cade53870efc5533e1c40bef01a [diff] |
am 38db5220: (-s ours) am 56f01033: (-s ours) am 40d4dd84: (-s ours) am 82640f6f: (-s ours) Import translations. DO NOT MERGE * commit '38db5220aef61cade53870efc5533e1c40bef01a': Import translations. DO NOT MERGE