| commit | 48def6ea188c4e2cfc75a63212507396fdc81d2d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 17:10:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 17:10:18 2015 +0000 |
| tree | f951c975eb2392551ddc0eecc2212fd7b65d1df0 | |
| parent | 9c6b0003241b1a51d69b1681034d2abad48736e2 [diff] | |
| parent | 322e1f57def9c86e735a94e8a92b6310655a6c33 [diff] |
am 322e1f57: (-s ours) am f05f4ff0: (-s ours) Import translations. DO NOT MERGE * commit '322e1f57def9c86e735a94e8a92b6310655a6c33': Import translations. DO NOT MERGE