tree e9fea619d7fd5d5b53e4465b5dceb8f59caefbe2
parent 38e5def5ceb39f10506e263c0cd55f021c54aa14
parent ea08e99a832ebb8027e465197bea6e6e20e7e051
author Bill Yi <byi@google.com> 1620707913 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620707913 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa5779f75a -s ours am: ea08e99a83 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14490401

Change-Id: I41da300d1dd4eea915a19aadaf21bd346cb7c779