tree 9aaf1eab950708142a1b6ef2a6282202e8c48852
parent 20272bec66c3ff9f43861d1c5d5d2c2af71673d4
parent 3ea5cfa8e8dcedc9b17bd637be631ad2559cfb72
author Geoff Mendal <mendal@google.com> 1439230454 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439230454 +0000

am 3ea5cfa8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '3ea5cfa8e8dcedc9b17bd637be631ad2559cfb72':
  Import translations. DO NOT MERGE