tree db51d69c13026f000776d0f546645af8ffa1b8ba
parent 9ab2c641bbd2a0db0d03f0b4e9e84cc81aca25fd
parent 121bce4c5598097678634f583e1e09ba71051149
author Wilson Sung <wilsonsung@google.com> 1650479366 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650479366 +0000

Merge remote-tracking branch 'goog/qcom/release/LA.UM.9.12.C10.11.00.00.840.265' into tm-dev am: c98d629586 am: 121bce4c55

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

Change-Id: I012b671bb196e5b8bb9267882dcf7e58fc137510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>