tree d93fc194489328153d8a53975d94ed4df10e6351
parent 060d9e465ea8fff549bdad19c2b51b0cba5563c6
parent 5c26ba7dd266f488e5699bc1d7f2c32382666746
author Geoff Mendal <mendal@google.com> 1431576300 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431576300 +0000

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

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