tree b63d6819065b00e3ba3d807218f1e57f1471ff26
parent bb58b332f9211426a228e1e2a1c50111659619b4
parent 9400562df91e7948fd9d6600c6e9c6d6e51783c6
author Xin Li <delphij@google.com> 1599011989 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599011989 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: acb4b2d440 -s ours am: 7c3413361b -s ours am: aafebf55b8 -s ours am: 9400562df9 -s ours

am skip reason: Change-Id I8d84faf48c0236373fcd6bed3e8355dfb50ddee5 with SHA-1 524bb0d57f is in history

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

Change-Id: I4602f7fe9cdebc6ae2ace9104ef4f730abe846f8