commit 2a5c68fe86b3ae680d8c5d5ea564fb8a6ac5f2cd
author Colin Cross <ccross@android.com> Tue Aug 01 22:18:33 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 01 22:18:33 2023 +0000
tree 53fed17681c63ae78d6e6f4b672320908b004fde
parent 4ce9c15224a891323b5e206812732cf0c69db40d
parent dea4c2613b906bda540caea44790115f4b85a844

[automerger skipped] Merge "Fix references to resources using incorrect packages in SystemUI-core" into main am: 35d5d62deb am: dea4c2613b -s ours

am skip reason: Merged-In I8f825ef549a5e0bd67e10d260ecdc3353a526fdb with SHA-1 61f1478772 is already in history

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

Change-Id: Id58ed967b9f7971f706e69bfa8bca9636b127b9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>