| commit | 6f6fc9b4c218169fdc88c56ac86a0a20d66e239b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:33:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:33:07 2015 +0000 |
| tree | 2a8e16b5cea28e0c4830d9b5feff6a321913a161 | |
| parent | 965a2d748de108b5ef9b50f65fe2728f96ee1e04 [diff] | |
| parent | 98aa99f778f5a9d07e04713aa23548127586c740 [diff] |
am 98aa99f7: (-s ours) am ed6f7ec1: (-s ours) Import translations. DO NOT MERGE * commit '98aa99f778f5a9d07e04713aa23548127586c740': Import translations. DO NOT MERGE