tree 89eed2a426b01d401c15781df1d387e7daa80fa5
parent 78ae7296581a755c8bf5f53260737c518b29e580
parent de7ae659ff91badf1aca55eab4a810b80508c097
author Geoff Mendal <mendal@google.com> 1443643713 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443643713 +0000

am de7ae659: (-s ours) am 91dd0872: (-s ours) Import translations. DO NOT MERGE

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