tree e99b1603dfe3fe7cf16d5b2e415cde77979fbbdc
parent 7e6f1776a0a1161d4aba2defd61e438cb95b99ce
parent e3289678998437319fc0a711234c4fed2bbabb87
author Xin Li <delphij@google.com> 1633657276 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657276 +0000

[automerger skipped] Merge Android 12 am: 608ea25d4a -s ours am: e328967899 -s ours

am skip reason: Merged-In I1fb6886e1a16a3df9397ef6a4e6dab7bbf838487 with SHA-1 6cdd3f1e1e is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/1847603

Change-Id: Ib455d31ad07311de096209a88e6e858b8613629a