| commit | 8bffae5b465d77b62b0d15f343ae592fe9c7d3df | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 22 14:17:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 22 14:17:29 2015 +0000 |
| tree | d5edcccb48ea27a5079bd8d786cb962645c9ccb6 | |
| parent | 1454ebbd2f2a35675c2c28d292918e559f13a39a [diff] | |
| parent | f96891537685d96709013da4d4ab1e51d9b96a1e [diff] |
am f9689153: (-s ours) am 1369b078: (-s ours) am ce17cd28: (-s ours) am 94491f6c: (-s ours) Import translations. DO NOT MERGE * commit 'f96891537685d96709013da4d4ab1e51d9b96a1e': Import translations. DO NOT MERGE