tree a36307776fba88e5b00b9d547ca9b07194d4ae31
parent 792da778f336bac8775c5eefc12c7c125914eba8
parent 8c302e34220ae13eacbd997eb955f55c545601e6
author Geoff Mendal <mendal@google.com> 1421681289 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421681289 +0000

am 8c302e34: (-s ours) am 21df8221: (-s ours) am 69b87f79: (-s ours) Import translations. DO NOT MERGE

* commit '8c302e34220ae13eacbd997eb955f55c545601e6':
  Import translations. DO NOT MERGE