tree 6739395c78ad8fb90cb1a207bfcb83e9ed910a0d
parent 5a893728a2bc7a12b6288d9f47060f4ba2a437da
parent b4564f2811be495f1893b136065fb7a6253f2124
author Bill Yi <byi@google.com> 1555540043 -0700
committer android-build-merger <android-build-merger@google.com> 1555540043 -0700

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

Change-Id: If92190894307fe9dfa8cab048de5a3dc5178a7b1