tree ce9ee4d13dae44c6a156e80879fc2c59f071c16e
parent fd7a7dc8482de00ab1a34fa23ec8d8e8b4985fe4
parent e5ec4ac409eb3d3169bb9350dfda51ae7e08291e
author Geoff Mendal <mendal@google.com> 1436980407 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436980407 +0000

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

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