tree 8c1753be924f1ca58e84fd73c517297e2709a288
parent d5b5576dd6565a61030d7769a44bd5189242a7e2
parent d7be88dc712afbf266114d3658c34a11126f0b17
author Geoff Mendal <mendal@google.com> 1418067873 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418067873 +0000

am d7be88dc: (-s ours) am 878b49dc: (-s ours) am 31a23f3b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

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