tree e342b8f25b0bd373404791175aaec467c5298354
parent aaaaca8aaa328bd2f72a27846ad30f7eece9295b
parent 84fa73c0d4ac0919a6f5b82376f04e68c06a6178
author John Stultz <john.stultz@linaro.org> 1622663745 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622663745 +0000

Merge remote-tracking branch 'gitlab/main' into HEAD am: 84fa73c0d4

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

Change-Id: I2f79b8d88dd378050c41cd982153e290445c0fa1