commit | 1ed75a0569b8ece86fe96eb4340cffb181f6765b | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Fri Aug 14 00:01:44 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 14 00:01:44 2015 +0000 |
tree | 95f0822ba83e68204ef27a3bb312561a7214df5b | |
parent | 16b5df58d6cbbf85d48b27d916750a7508a5d766 [diff] | |
parent | ca74f32c12bbbe401f0f266751fccd34148229dd [diff] |
am ca74f32c: (-s ours) am 3fc785ce: (-s ours) am 762b4fd8: (-s ours) Import translations. DO NOT MERGE * commit 'ca74f32c12bbbe401f0f266751fccd34148229dd': Import translations. DO NOT MERGE