| commit | a356afdaf31685e0bda3869f67b6b9c7433c0249 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 12 17:13:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 17:13:23 2015 +0000 |
| tree | f45df24f8db1a9683729123a8c76e0f19b8323c4 | |
| parent | 110450dbcd4482c864556b7d01a69cbac442fc29 [diff] | |
| parent | 956d9545af6d6af42907f08fdd57c39d6f7be981 [diff] |
am 956d9545: (-s ours) 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 '956d9545af6d6af42907f08fdd57c39d6f7be981': Import translations. DO NOT MERGE