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