tree 363515e06e8521139eab3728fe5b1826f0523ea6
parent c056ea0d52de5979497dc6c6e8c9bce3768a73d9
parent ff4ac67089b06ee83bc5a3146c78aa7ce51fcd86
author Bill Yi <byi@google.com> 1634877043 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1634877043 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ff4ac67089 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If4eadbdd72934e7bda1b16754dd0f4ca81089719