[automerger skipped] Merge "android.hardware.media.c2: sync with internal" am: 9efd5025fc
am: 75979829db
am: 6cef0242f0
-s ours
am skip reason: Merged-In Ia85af4e013529e104c84bc48f84a5daa89a5d9bf with SHA-1 e739e842ba
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2613749
Change-Id: I2df799a62f2ca8d434b8d75f05c986c3d12b2d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
f4b3f59092