| commit | 62679a1f6d04a554e452b5126ccb784c3870a035 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 14 14:13:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 14:13:42 2015 +0000 |
| tree | 06e57c6490ad82c3780c662f75f6c89da9aa5406 | |
| parent | f23e617bcd8090ef96a5449907c4db39f7efb6a5 [diff] | |
| parent | c095272a807880bca2848b102438ec9a13dec749 [diff] |
am c095272a: (-s ours) am 7013f0c8: (-s ours) Import translations. DO NOT MERGE * commit 'c095272a807880bca2848b102438ec9a13dec749': Import translations. DO NOT MERGE