tree 527217c7b143d5b774db00b6ea84cf322ff47016
parent 188a91b2a195604a285580db73bc3ba04ead09e3
parent 855eaeecd3bf8200c3802c776b603aaa1ad1da54
author Bill Yi <byi@google.com> 1561388564 -0700
committer android-build-merger <android-build-merger@google.com> 1561388564 -0700

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

Change-Id: Idb5d6682c43c8ff5a93328999c82a221bdb8994d