tree e85f41c8ce649fd6070037f323d36f81235fc626
parent b7443004d895656c7fe7500001f55b9130c5c1b9
parent ad4d162835f97eadaf45b095253847da90804265
author Geoff Mendal <mendal@google.com> 1436996669 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436996669 +0000

am ad4d1628: (-s ours) am eb01b967: (-s ours) Import translations. DO NOT MERGE

* commit 'ad4d162835f97eadaf45b095253847da90804265':
  Import translations. DO NOT MERGE