tree 5e9338079676d40e218193c1a567b6a54145e9cd
parent 1f26d3a09b530e3a67acc20c13a94f3571972c84
parent f9244ffc20c270fef5299a91581b91ddda517148
author Xin Li <delphij@google.com> 1637144453 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637144453 +0000

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 545f2961b6 -s ours am: 7e248745a2 -s ours am: f9244ffc20 -s ours

am skip reason: Merged-In Ie1510b730a4c573b8e3d970bb3f04d6c4d94e90e with SHA-1 9553356090 is already in history

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

Change-Id: I5288bb3c5d77e666a8a0a5d3d3e34eb4ef314c8f