| commit | 98ec64cc8c123e135d486134de5a61257ab0a647 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:38:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:38:50 2015 +0000 |
| tree | 7f26ec3740f6dfa35441fec4964c287665c735d7 | |
| parent | ff36e95941bc564909c0b9a42b2ebfc31493c021 [diff] | |
| parent | b778fdff3d9d9b7b272ba8b52f68f991b3269110 [diff] |
am b778fdff: (-s ours) am 624275b5: (-s ours) Import translations. DO NOT MERGE * commit 'b778fdff3d9d9b7b272ba8b52f68f991b3269110': Import translations. DO NOT MERGE