tree 67dc1ea9e29e01567994c637bb82d00c5939e7e3
parent c45f673419f8c924bc169a2931e974de59684022
parent 7b37fe754cd3dfd36abf74171f5a517112eae575
author Geoff Mendal <mendal@google.com> 1413844621 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413844621 +0000

am 7b37fe75: (-s ours) am 465d16d4: (-s ours) am a7992209: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '7b37fe754cd3dfd36abf74171f5a517112eae575':
  Import translations. DO NOT MERGE