tree b2099f54f527daf937f8be0e6f7a414473837890
parent f2e81836dc190f584d3e2c1764c7cb9bb9066bff
parent f57c1564b53eab486a5ac006ac5be2a9e1e33cc8
author Geoff Mendal <mendal@google.com> 1395089083 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1395089083 -0700

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

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