tree 4e628b0f47dfed879f3358bceb70881bebba5a1b
parent 9503ee1351a1bf0d61ddc887ba77774fbcda2176
parent e180f0bf00daab9f988ad591de55bf99f463ec15
author Xin Li <delphij@google.com> 1629229601 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629229601 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: b7b8df5fae -s ours am: e180f0bf00 -s ours

am skip reason: Merged-In I1851881b4c639ab5ec8b27bcc8a92fb9218a93c7 with SHA-1 9503ee1351 is already in history

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

Change-Id: Ifed29ba9aa94f2263125c0ff3787885f672a98a1