| commit | d0cb0b90caea9e529c2126712b2cd9a56b61eb8f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 12 12:33:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 12:33:32 2015 +0000 |
| tree | f90f6d2177056828239dd136337a3b5807dd0e92 | |
| parent | a66df44ae67de0d639133d6e0bbabe524c3d9087 [diff] | |
| parent | 23a7ba69330bcd39d573776a67d01771a46be671 [diff] |
am 23a7ba69: (-s ours) am 36b27180: (-s ours) am 26dfa3dd: (-s ours) Import translations. DO NOT MERGE * commit '23a7ba69330bcd39d573776a67d01771a46be671': Import translations. DO NOT MERGE