commit | c123f953007aefb7297b399eb03397d1a7406593 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 12 13:14:14 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 13:14:14 2015 +0000 |
tree | da373ba84a76391ee202dea14f7ebbd5d0e5ee3e | |
parent | 5a761be3dd72b5a318f9387d104f7010b327bfec [diff] | |
parent | 4accfd0b121d2b258bca301b16f62c1ac760d89c [diff] |
am 4accfd0b: (-s ours) am 1bd19dd1: (-s ours) am 0e3ffe7c: (-s ours) am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE * commit '4accfd0b121d2b258bca301b16f62c1ac760d89c': Import translations. DO NOT MERGE