tree 3003369ce1ad048587dc3117deb95f13ab4b4c7c
parent 5e4eac9b665064b642438a86bfc52ff9aa507397
parent 5b7a9933697e2d73a003116df9f639d44242fd61
author Geoff Mendal <mendal@google.com> 1436892118 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436892118 +0000

am 5b7a9933: (-s ours) am e8a00afb: (-s ours) am b2f710d9: (-s ours) am c54d8bae: (-s ours) am eb0be29e: (-s ours) Import translations. DO NOT MERGE

* commit '5b7a9933697e2d73a003116df9f639d44242fd61':
  Import translations. DO NOT MERGE