tree 8b5fed58742e68368370b349cd081491e1e894c6
parent 7b37fe754cd3dfd36abf74171f5a517112eae575
parent 3333393036906207ad388f00d15dda3bf46b9633
author Geoff Mendal <mendal@google.com> 1413844774 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413844774 +0000

am 33333930: (-s ours) am 844b1532: (-s ours) am 2c373272: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '3333393036906207ad388f00d15dda3bf46b9633':
  Import translations. DO NOT MERGE