tree c2871e38854566ad88cbbc2165b728f73a8eb4eb
parent 56d228108e13dd7fdac00c009df7efb40db36fc7
parent 78d290f345b5b407a2f6e6f0442b74115179f03e
author Bill Yi <byi@google.com> 1560881301 -0700
committer android-build-merger <android-build-merger@google.com> 1560881301 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 78d290f345 -s ours
am skip reason: subject contains skip directive

Change-Id: I73dee13d57d8b11be04a0ed72d8929a2db6f2983