tree 92d78e4d3bcabde47cc0605eb672d56321cc8ceb
parent c5cb1e04474d34ac90fc34a1671860e4bb75925f
parent 06cc4df53eb863c7d69027aa195a4183313b3ef4
author Bill Yi <byi@google.com> 1533393203 -0700
committer android-build-merger <android-build-merger@google.com> 1533393203 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 06cc4df53e  -s ours

Change-Id: I0609ccd1ccf2cbe85fd9c6cf03cf0b65f5bc7350