tree 154754ae93c303656f7b8f6b4a0ea5c346533101
parent 0f308b47e08552d86c41513a2cd709099158c601
parent 9a9367fb6f029640de85cc49825b2eadabc76a00
author Geoff Mendal <mendal@google.com> 1436800155 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436800155 +0000

am 9a9367fb: (-s ours) Import translations. DO NOT MERGE

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