tree 73600ba3bf4c8a4003fcb4c62188534d79bb2c7b
parent 17904f8b9c7553601d4ec1b24356c43cb80c318f
parent 9ece2e960046a169ac30c4b23119052793c76d98
author Geoff Mendal <mendal@google.com> 1417725089 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417725089 +0000

am 9ece2e96: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '9ece2e960046a169ac30c4b23119052793c76d98':
  Import translations. DO NOT MERGE