tree 2206a171dd6a9539e29b2088c3846e5b6e288230
parent 6be0fd3502b23dfcd79c72208c797d1d11344d98
parent 0580b4fdf147be52cadb444e0bd5b7ffcd1e66b5
author Leon Scroggins <scroggo@google.com> 1679603326 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1679603326 +0000

Merge "Fix hwui compile error" am: 9bbcd6e11e am: b867bee3da am: 0580b4fdf1

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

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