tree 0d589f942ded5ca734691ba2939a3716457c8859
parent 623b2a4521938c8935bc12bbba2ae55b11ebd97b
parent d364007862957477b909bbc9aa29d2eb3e08f8c1
author Bill Yi <byi@google.com> 1584649866 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584649866 +0000

[automerger skipped] Import translations. DO NOT MERGE am: e19a23a7ff -s ours am: d261f80c30 -s ours am: 7e82134093 -s ours am: d364007862 -s ours

am skip reason: subject contains skip directive

Change-Id: I2f71b4e21879156e609d01f1b49b20dfb848123c