[automerger skipped] RESTRICT AUTOMERGE - resolve merge conflicts of … · CipherOS-Revived/android_frameworks_av@8537cde · GitHub

Commit

[automerger skipped] RESTRICT AUTOMERGE - resolve merge conflicts of d…

Browse files

…ab37c2 to qt-qpr1-dev am: ec0754c -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/19823968

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

Loading branch information

Edwin Wong authored and android-build-merge-worker-robot committed Sep 2, 2022

2 parents d37b692 + ec0754c commit 8537cde