tree 6f3ef61b88b9fe16ff7692642ce1f7f9fe7a1d55
parent 70dbf05d50f29685f0754a35c96fe2b041b5ac2f
parent 0bb8ba322e0bed9d988e14888079c5d6283cfacc
author Geoff Mendal <mendal@google.com> 1422891026 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422891026 +0000

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

* commit '0bb8ba322e0bed9d988e14888079c5d6283cfacc':
  Import translations. DO NOT MERGE