tree 132fe0227dbde77164cebf15e004915ca2d18bf4
parent 116183ac89ffe253991766819e7eb3f748c67761
parent eaaae47d8901dd59a536181e07d585fe29dc53cd
author Geoff Mendal <mendal@google.com> 1436365104 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436365104 +0000

am eaaae47d: (-s ours) am 20ad9246: (-s ours) Import translations. DO NOT MERGE

* commit 'eaaae47d8901dd59a536181e07d585fe29dc53cd':
  Import translations. DO NOT MERGE