tree 35bb7fb721b11264c812f8e975b51ebc854b5fe9
parent 13a1fda4ca87d6ecb818d146fa9f0fb9509be258
parent 0f308b47e08552d86c41513a2cd709099158c601
author Geoff Mendal <mendal@google.com> 1433024545 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433024545 +0000

am 0f308b47: (-s ours) Import translations. DO NOT MERGE

* commit '0f308b47e08552d86c41513a2cd709099158c601':
  Import translations. DO NOT MERGE