tree f9eb3a48c6339f9cd744cd98fa184bb54a9244d6
parent 33efae822e69f531074fab7344ab81c14a867726
parent be377b58d5c68c7dcdd15ee215cdb347499c73dd
author Geoff Mendal <mendal@google.com> 1412634676 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412634676 +0000

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

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