tree b2099f54f527daf937f8be0e6f7a414473837890
parent 74899e96b85fdb156394d75b9237df54015a0cfa
parent f2e81836dc190f584d3e2c1764c7cb9bb9066bff
author Geoff Mendal <mendal@google.com> 1395089047 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395089047 +0000

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

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