tree f7e4affe4b23e49dba29712777c563a15ca20058
parent 6e69aeb9b2eb9cbe8fb1006cd2f598f7acd6b6d5
parent ce9003f7c24f44d8e1d1fee65dca444e6a61d061
author Geoff Mendal <mendal@google.com> 1413226627 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413226627 +0000

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

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