tree 169923c910e13cd6a1efaa2ddca84355cf84aa7b
parent f181a84fbdb04cf20d3c832c0af2c9f8cf8d89ea
parent 2c05f5954fb033a1f24432dd8386bda37ea5e816
author Geoff Mendal <mendal@google.com> 1425055673 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425055673 +0000

am 2c05f595: (-s ours) am 86117ad0: (-s ours) Import translations. DO NOT MERGE

* commit '2c05f5954fb033a1f24432dd8386bda37ea5e816':
  Import translations. DO NOT MERGE