tree b76f7f9bfeea20819931e7f6bb443cd3525b2258
parent 48ac99fc155cf107e5442a93a54245ccbdd94ac1
parent 480c600df210b9b0c421ab4e7387a453aac849b4
author Geoff Mendal <mendal@google.com> 1438446984 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438446984 +0000

am 480c600d: (-s ours) am 97e3b5fc: (-s ours) Import translations. DO NOT MERGE

* commit '480c600df210b9b0c421ab4e7387a453aac849b4':
  Import translations. DO NOT MERGE