tree 927412132cb3b5e2eeb7458c8d067cfba05460b9
parent 2a95640c5b4c6a5d07bf91fd9fa15e953624b283
parent 48def6ea188c4e2cfc75a63212507396fdc81d2d
author Geoff Mendal <mendal@google.com> 1433182625 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433182625 +0000

am 48def6ea: (-s ours) am 322e1f57: (-s ours) am f05f4ff0: (-s ours) Import translations. DO NOT MERGE

* commit '48def6ea188c4e2cfc75a63212507396fdc81d2d':
  Import translations. DO NOT MERGE