[go: nahoru, domu]

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 6da222fc09 -s ours am: d23ed625fc -s ours am: c6d76509b9 -s ours am: 0b0b5630cc -s ours

am skip reason: Change-Id If59a1a4a9c779b41916cbea378d885e1295ac15c with SHA-1 fad1e7d9a1 is in history

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

Change-Id: Ibfadf70dca85efc0201058ec5a0d5403b0af9d6b