tree 6ec7790e4462136e54844fa173ba38bede3a141a
parent 113b204c61a05ed38b015a3c350addadef330343
parent f23540c3adbfe81393ccb6d5500ee54ebbc1a0dc
author Bill Yi <byi@google.com> 1585174477 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585174477 +0000

[automerger skipped] Import translations. DO NOT MERGE am: c054f231ae -s ours am: 2f0bcbd3dc -s ours am: ce93a7756a -s ours am: e22f2a4b96 -s ours am: f23540c3ad -s ours

am skip reason: subject contains skip directive

Change-Id: I5ecb2db2ffd50facd1554827f08b8181a63247ff