tree ee42d8c9fa481abf8d3af2310246b2c153343a17
parent 944d98822fc53a15cc68cfdb855fabb448ed7632
parent bc8b2d4dd816d29943c6b50c1936b42e9f77cf63
author Geoff Mendal <mendal@google.com> 1425054851 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425054851 +0000

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

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