tree 84230245b6d0620425180d5fab12ff558de999ab
parent c55bd3f0f8c11ddb6ed08dd7f753f09320318fb4
parent c2089c4172fae3ec54aca2ee9bbf4a1919d5c9e5
author Geoff Mendal <mendal@google.com> 1440685113 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440685113 +0000

am c2089c41: (-s ours) am dbb3ae89: (-s ours) am a8f551b5: (-s ours) Import translations. DO NOT MERGE

* commit 'c2089c4172fae3ec54aca2ee9bbf4a1919d5c9e5':