tree 41fc518d81e56956e90ac906833f9f86fc6f262a
parent 8cf0258fc50e2c7fb5d1436e6ad6c727bd5e886c
parent ccb61e86a905a9129c92dd36a02c377bf3bbde03
author Xin Li <delphij@google.com> 1598998210 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598998210 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: e340f69bcd -s ours am: ed4b2be34d -s ours am: ccb61e86a9 -s ours

am skip reason: Change-Id I8695ee884ff9163eab82670e0dd3c711fa37258a with SHA-1 601c931b55 is in history

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

Change-Id: I5a849f343e74ace41ebfbce6f41d5e7971e65715