tree fbb275f0fe01e5ab5f39bf9b826b9652e345f4f5
parent 535fb2ee4ad80e93c1aeb1965a6548f92cffcb39
parent 9f448819c1b49faf6d77ad9144bcb87a5176d870
author Geoff Mendal <mendal@google.com> 1436979462 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436979462 +0000

am 9f448819: (-s ours) am 86b877df: (-s ours) am cf2b3aea: (-s ours) Import translations. DO NOT MERGE

* commit '9f448819c1b49faf6d77ad9144bcb87a5176d870':
  Import translations. DO NOT MERGE