tree 10da860fcff71886af91d082e31f0e1917926848
parent d8b76d24b314f91c4c6520ebfaf74a207918e55a
parent 1bcebeae71856c360972b86e1a22d53113bb3cc0
author Geoff Mendal <mendal@google.com> 1422666430 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666430 +0000

am 1bcebeae: (-s ours) Import translations. DO NOT MERGE

* commit '1bcebeae71856c360972b86e1a22d53113bb3cc0':
  Import translations. DO NOT MERGE