tree b96ee8b826da69869e2aaf557f3fbb97f138b9b1
parent 96b06db8377af6dfbd46379c66f22af9d68fdb7b
parent 696e4cbc722aa5ac8212209583185fc8fb19e1a0
author Xin Li <delphij@google.com> 1629229599 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629229599 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: d9994bdea0 -s ours am: 696e4cbc72 -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: I039fc5a8d6f9ecf62fae7948e52e872727e36a1c