tree 8dac9a42d7e98e4a1a7093c7f7bf0d6a214fb9d6
parent e43596160c18c2eba0147e4a3b4f3f7208691df6
parent 72b2814607341840fd3f8b9029f0b939853fc140
author Bill Yi <byi@google.com> 1505687852 +0000
committer android-build-merger <android-build-merger@google.com> 1505687852 +0000

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

Change-Id: Ib26e3fc87a63259b4a8aace9672cb87edce2a116