tree a2ed6dd5d7636adf04e2a857153ae0ec0565c49f
parent d7f908cc51be2a1643f5d631be683f4437c5a828
parent 2cbb2d13da04fb1da46f95f30ecccee5be2b568d
author Geoff Mendal <mendal@google.com> 1436978034 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436978034 +0000

am 2cbb2d13: (-s ours) am a7866cd9: (-s ours) Import translations. DO NOT MERGE

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