tree ff480a7acac17d85768a429d421462c9ba45106a
parent f60d844103c9ff9c2de868f23bed993812a17d99
parent 0c4609ba51c816a0c97e0c6ddc9e927f7e142bf4
author Bill Yi <byi@google.com> 1590945575 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1590945575 +0000

[automerger skipped] Import translations. DO NOT MERGE am: 0c4609ba51 -s ours

am skip reason: subject contains skip directive

Change-Id: Icc2e0ea2a336839783d3469800f27bd431947913