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