tree d8480df12e5c29ce1f59d6f3da382e8b175ca898
parent 653e3ce35aa6167a25482db909452a81dd0fa860
parent dcb985eafe0a20e2cdc36c1882ef7104a22829ec
author Geoff Mendal <mendal@google.com> 1436979747 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436979747 +0000

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

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