tree 5922dbd3c47d187720fe08e978bcc536970e3ae5
parent f8dd4544a42c88918da2349b491650b0cc427b50
parent 163d99edee2724a7d5defaaa65f4aa7ab61c96e3
author Xin Li <delphij@google.com> 1637178855 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637178855 +0000

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ac850066c3 -s ours am: 163d99edee -s ours

am skip reason: Merged-In I302491d47346aa48eebcac6498991fda95f62b58 with SHA-1 a976c15a02 is already in history

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

Change-Id: I4a4122441b474e2f8afd3d117eb1fe1541879559