tree be5f7e7d72a7982bf4499da1eb388d7747a630d8
parent bcc590251d8151f845807ffcbe723fb9fa62f200
parent 941018fb1c7e56d7f752ebda55ec075aee551fec
author Geoff Mendal <mendal@google.com> 1436366013 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436366013 +0000

am 5e60e7c1: (-s ours) am eaaae47d: (-s ours) am 20ad9246: (-s ours) Import translations. DO NOT MERGE

* commit '5e60e7c1030630f4052fd29982c15fd4ed78ec5e':
  Import translations. DO NOT MERGE