tree 8b751bbeffdc9ad4c96226ce05ee2edb5616df52
parent 0c041b57316c85c70f0589f676aa02632d284f5e
parent fcd59cd1f3a76250ffa546b1ba6641841d9f792b
author Geoff Mendal <mendal@google.com> 1436359668 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436359668 +0000

am fcd59cd1: (-s ours) am 2d37dbd0: (-s ours) Import translations. DO NOT MERGE

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