tree f951c975eb2392551ddc0eecc2212fd7b65d1df0
parent 48def6ea188c4e2cfc75a63212507396fdc81d2d
parent e5ec4ac409eb3d3169bb9350dfda51ae7e08291e
author Geoff Mendal <mendal@google.com> 1436980142 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436980142 +0000

am e5ec4ac4: (-s ours) Import translations. DO NOT MERGE

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