tree 985cf6e3c01bd13ad108748845f5429dae7dbac4
parent cb32559a1ecc476a4502928b0c4e37cd0f7b836c
parent d53436a9d96100883e55e09ca3e0d5b6eae4fc35
author Geoff Mendal <mendal@google.com> 1415640462 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415640462 +0000

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

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