tree d1cd72ebefd86571daeffd04591a8db7db9a27da
parent 8fada8aa90879628b4ef609a96f1855aa5c7d466
parent 42f5da51924788b9416e3359059eaf9374113ab0
author John Stultz <john.stultz@linaro.org> 1639513394 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639513394 +0000

drm_hwcomposer: Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: 774e5e3432 am: 24ccb88ece am: 42f5da5192

Original change: https://android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/1921343

Change-Id: Iae3684f162cd9e86a0feca58480a2dbcf3f450fe