| commit | 107f6f6acca744782d12e4e9dacc07a05e0acdf1 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:36:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:36:59 2015 +0000 |
| tree | f16027c118b17ff680750d876012b663b5b2fe2d | |
| parent | 5067852494c939fd88e88da8c7fbd528fbb5e622 [diff] | |
| parent | 979f4343e392a6627b5a3227d48219479b5ba541 [diff] |
am 979f4343: (-s ours) am 98f5af66: (-s ours) am 7262e3ae: (-s ours) am d2397fbc: (-s ours) Import translations. DO NOT MERGE * commit '979f4343e392a6627b5a3227d48219479b5ba541': Import translations. DO NOT MERGE