| commit | 956d9545af6d6af42907f08fdd57c39d6f7be981 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 12 13:27:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 13:27:09 2015 +0000 |
| tree | 9455cde495d658f78e2d561a60a374b59c021595 | |
| parent | 61a490837cd54c6e31de74b35762f7cbb0a85d80 [diff] | |
| parent | 7f15902c4bfaf2c74f7702cb68af03e9f9d08008 [diff] |
am 7f15902c: (-s ours) am f999d572: (-s ours) 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 '7f15902c4bfaf2c74f7702cb68af03e9f9d08008': Import translations. DO NOT MERGE