tree 0058fd1a78994683a244210ed5996745329b84e9
parent 6ff988b614bf23cbb1b9e4b545a5739a8480257a
parent 04a0ff188ab2a0ea169e281619dd822fbd67ae50
author Geoff Mendal <mendal@google.com> 1425054839 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425054839 +0000

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

* commit '04a0ff188ab2a0ea169e281619dd822fbd67ae50':
  Import translations. DO NOT MERGE