tree 7abdc5c64101b8d2e20a7740366b4d9f2f7a3e0c
parent a255e7b112b1105b16e17edfc859f11455d1e74c
parent c735b93e3798036e4f3eea5598f7966883a4b1d5
author TreeHugger Robot <treehugger-gerrit@google.com> 1660342918 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1660342918 +0000

[automerger skipped] Merge "Fix SystemUI build for kotlin 1.7.0" into stage-aosp-master am: c735b93e37 -s ours

am skip reason: Merged-In Ib1605aaff28492b557deac4156f3cc2f4cf8b329 with SHA-1 6e3d0a66d2 is already in history

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

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