tree f7e4affe4b23e49dba29712777c563a15ca20058
parent d6a85f6e8466ab762377b97876257bb05a9c73d2
parent 1b77f365d63828e5111a1bec6495a06c07154771
author Geoff Mendal <mendal@google.com> 1413226154 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413226154 +0000

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

* commit '1b77f365d63828e5111a1bec6495a06c07154771':
  Import translations. DO NOT MERGE