| commit | 58c7d5e5cc29de5eeacd74999ad9d70dada6069e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:17:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:17:30 2015 +0000 |
| tree | 028deb7382c5b736bca3943aa38f361c40411c95 | |
| parent | c9984a3629c4071f6cab0a41feb54de5ce190bfa [diff] | |
| parent | 3118a2317b539fb068dfa72ba8c4a5a7fafcae2e [diff] |
am 3118a231: (-s ours) am c44f6cd0: (-s ours) am 75443c18: (-s ours) am 2cbb2d13: (-s ours) am a7866cd9: (-s ours) Import translations. DO NOT MERGE * commit '3118a2317b539fb068dfa72ba8c4a5a7fafcae2e': Import translations. DO NOT MERGE