tree c2854f9c72d274b559da4fa7dc09d7d534b3c17b
parent 70220e7749a4b2d23433a9d96b0c6e01eb154dcb
parent 727f8d40e6de87a6c6716c2640e476c362d2dd48
author Geoff Mendal <mendal@google.com> 1424997876 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424997876 +0000

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

* commit '727f8d40e6de87a6c6716c2640e476c362d2dd48':
  Import translations. DO NOT MERGE