tree e342b8f25b0bd373404791175aaec467c5298354
parent 42b90536d6d39b96b0417e19214dcdb727b80368
parent 82288efb3a5e9d08eed5f12b852e419f635c1bc9
author John Stultz <john.stultz@linaro.org> 1622664925 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622664925 +0000

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

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

Change-Id: If18723bda10941e12869cd0d586bfc7f6acaa69a