| commit | 2cf3069b2e5a0160ce302ea8b36d8198b5c65283 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:53:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:53:23 2015 +0000 |
| tree | 9323f9996dc47f6c58b7cc0d5302a5b9f4e435ac | |
| parent | c4de8153f8ec59e13adad16ca6db58888874495b [diff] | |
| parent | cb469c247cf1f82bc4b11faea98705d1d8c8fe87 [diff] |
am cb469c24: (-s ours) am 3225addc: (-s ours) am 9e5af63c: (-s ours) Import translations. DO NOT MERGE * commit 'cb469c247cf1f82bc4b11faea98705d1d8c8fe87': Import translations. DO NOT MERGE