tree 686d3df09c9c78d8689cf04457d9283af97a2986
parent 4a8367c6bf026f78f2b7d9e5942fb4b872ac4f4f
parent e2b029539fb87cae5b4024731c61fcc6495b2abb
author Xin Li <delphij@google.com> 1598996785 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598996785 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 1e442be16e -s ours am: e2b029539f -s ours

am skip reason: Change-Id I189f8b99b6095e5796bc28ffa4447ca21697f0ea with SHA-1 dca0484981 is in history

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

Change-Id: I08e412c96b48314e8f3603d0395b46bd2a2fb384