tree b96ee8b826da69869e2aaf557f3fbb97f138b9b1
parent bab1f757a5c7abe144596c9cfa72024f4d9e80ca
parent 75db59ca8e0806bd3c4bc74244caf1df2c49c138
author Xin Li <delphij@google.com> 1629246242 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629246242 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: d9994bdea0 -s ours am: 696e4cbc72 -s ours am: 257ebdc301 -s ours am: 75db59ca8e -s ours

am skip reason: Merged-In If889d37eb0a4a280e5a371a10cd9d01e526a06d2 with SHA-1 96b06db837 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/display/+/15571741

Change-Id: Idbba9978c861433461355f7ad5a7b65ded320f77