| commit | 05e3bbc22efc66e52c06885842ed0c8478e5e517 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 06 12:55:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 06 12:55:12 2015 +0000 |
| tree | c1ee11e8a383d8de9a4b4b4332660cd55a4e408e | |
| parent | e78edc6423fdc46dc85d79d5416505ba55be02f1 [diff] | |
| parent | 0356bca6a6a84663f8d4a7075c3c2780ccdb9ca7 [diff] |
am 0356bca6: (-s ours) Import translations. DO NOT MERGE * commit '0356bca6a6a84663f8d4a7075c3c2780ccdb9ca7': Import translations. DO NOT MERGE