tree 196dc858ebf5336b389f2b8c760f5dae63ce3590
parent 23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
parent 02914bc95badcda08e8f0f46fa80b5ae5bc75f49
author Bill Yi <byi@google.com> 1465266665 +0000
committer android-build-merger <android-build-merger@google.com> 1465266665 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ffe7746437  -s ours
am: 02914bc95b  -s ours

* commit '02914bc95badcda08e8f0f46fa80b5ae5bc75f49':
  Import translations. DO NOT MERGE

Change-Id: Ia03a3fbd0937327715e12911ce71c613eeabbb8e