tree d773639dfaaf0127283b4494f54a74d44a1e324a
parent 4b0f7dd2c0c4773606cb583f7f8b42b7bf092366
parent 875cdbd24b1ab3627d9663a49fcb943cdb5b91b4
author Geoff Mendal <mendal@google.com> 1423790095 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423790095 +0000

am 875cdbd2: (-s ours) Import translations. DO NOT MERGE

* commit '875cdbd24b1ab3627d9663a49fcb943cdb5b91b4':
  Import translations. DO NOT MERGE