tree f35141b18c192749e58a5eb5191f3b774d3ec2fb
parent 38b8b80f143ab809f8adcac4523d57c6e6c69cd4
parent aaded1bd47a59842bdc52c56484dc24d3c924838
author Bill Yi <byi@google.com> 1509337551 +0000
committer android-build-merger <android-build-merger@google.com> 1509337551 +0000

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: aaded1bd47  -s ours

Change-Id: Ic66cfcb1baa579548d30877c4000c597b11e2d73