tree b201b7c93d336dc8578f0f3a257347e9ca5594b4
parent 4358ca81ed5870736d6c2c2d520d5933f2d3d68b
parent 05ab24825ceafc55666eb57fd213af5dd90b66b7
author Bill Yi <byi@google.com> 1570123456 -0700
committer android-build-merger <android-build-merger@google.com> 1570123456 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 678feaf43a -s ours
am: 05ab24825c -s ours
am skip reason: subject contains skip directive

Change-Id: I9155921f2e77628f6726fd46ccb0d58570b231b0