tree f4d0e888a3a6dca767811ede7081b97566137a84
parent 2dbb4da80b40b6a2fcf9084b4aabbc73c1130771
parent 8c0686e7026b5aac6884050fb63d8134d87e7744
author Bill Yi <byi@google.com> 1629243843 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629243843 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I851d68992c9ca881312d39cec7c756f7f7d47b9a