tree 904ec9eb365538be19b768ed1790f324a64c8b1e
parent 0071971480f08740ef4e77b420c565e4a336c096
parent 1b3cf292c53ad2f8e16d47567e36e5f53596f57a
author Geoff Mendal <mendal@google.com> 1416234613 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416234613 +0000

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

* commit '1b3cf292c53ad2f8e16d47567e36e5f53596f57a':
  Import translations. DO NOT MERGE