commit | bbed30932260f602e0181d553e7fdc10c7a29a26 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Aug 17 13:11:55 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 17 13:11:55 2015 +0000 |
tree | 95f0822ba83e68204ef27a3bb312561a7214df5b | |
parent | 05f11de602bca04ce366725e63f1b65e9a341a06 [diff] | |
parent | ae17cde203ffe19500febfc1d3d8dfe80b07e123 [diff] |
am ae17cde2: (-s ours) am d018c892: (-s ours) am f4807c6d: (-s ours) Import translations. DO NOT MERGE * commit 'ae17cde203ffe19500febfc1d3d8dfe80b07e123': Import translations. DO NOT MERGE