| commit | f999d57278db3c12ce0911d83781978f657f8ede | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 12 13:17:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 13:17:48 2015 +0000 |
| tree | 41465293c3cb8ccc9852f176898119809bc8e832 | |
| parent | c483a5e3fc3377c5ea3535e908c60ba1ac901936 [diff] | |
| parent | c123f953007aefb7297b399eb03397d1a7406593 [diff] |
am c123f953: (-s ours) 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 'c123f953007aefb7297b399eb03397d1a7406593': Import translations. DO NOT MERGE