| commit | 2b0bfb11a64a4c75b8fe09d027f7b7f12e11fa55 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:20:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:20:57 2015 +0000 |
| tree | 8924d31ff2ecb8b544ab35dab62f515aac397156 | |
| parent | dd4db22dcd77f6e1c964da85313f957774ad7672 [diff] | |
| parent | 05e3bbc22efc66e52c06885842ed0c8478e5e517 [diff] |
am 05e3bbc2: (-s ours) am 0356bca6: (-s ours) Import translations. DO NOT MERGE * commit '05e3bbc22efc66e52c06885842ed0c8478e5e517':