tree 498bf0632deb2f9b2837ef131ff0a068d3f2adf3
parent 3db586f55a78fe33247313e9fe794cfbce6a2c88
parent 5539ecdfa5c457f356420fc7c71ead4cb0090a5d
author Bill Yi <byi@google.com> 1563214540 -0700
committer android-build-merger <android-build-merger@google.com> 1563214540 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 3a8f890430 -s ours
am: 5539ecdfa5 -s ours
am skip reason: subject contains skip directive

Change-Id: I3635f085607f771a075502044e402db0238b08a2