tree 3e4be930d63c53f798eb8b63a0a3fda5e7bc1c43
parent 47c0c13464d2756db9c0e839d7f96114b92420c7
parent 99f71e0f53a387ce376486c7825f301b7e6bfbe5
author Geoff Mendal <mendal@google.com> 1436195821 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436195821 +0000

am 99f71e0f: (-s ours) am 0356bca6: (-s ours) Import translations. DO NOT MERGE

* commit '99f71e0f53a387ce376486c7825f301b7e6bfbe5':
  Import translations. DO NOT MERGE