tree f951c975eb2392551ddc0eecc2212fd7b65d1df0
parent 32cbb6efe29137ce2fbc127f9e83a096e5a14364
parent f05f4ff01ced043832f714d6f841bae33d8cb141
author Geoff Mendal <mendal@google.com> 1433028244 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433028244 +0000

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

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