| commit | 75a77cc77d30be0b8eb7b0e8dbd398ba1d8321cb | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Aug 07 04:55:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 07 04:55:25 2015 +0000 |
| tree | 62cd4fb7e4b57a7d3c80d05a1ccde40f6bbe1d81 | |
| parent | ae560bf189a7f738d67e87ed78579203b99a0066 [diff] | |
| parent | 233f1b61ce627819adb4351eb0b2d78f3020a38d [diff] |
am 233f1b61: (-s ours) am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE * commit '233f1b61ce627819adb4351eb0b2d78f3020a38d': Import translations. DO NOT MERGE