tree 5dd197c6cf398f5312e7a87e9475bae3b23ec333
parent 3b85f23d7e35159818c25dee35c9f27e8617c548
parent 5c3561c0cea77cb244d9f8a76f5a4bd3abf77e25
author Bill Yi <byi@google.com> 1563485148 -0700
committer android-build-merger <android-build-merger@google.com> 1563485148 -0700

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

Change-Id: Ib5622d745f14bd299f967e5075cfbb47ce8b44ce