refs/heads/upstream/android12-qpr1-d-release - third_party/android/platform/frameworks/av

commit: 19f92fb220a5587ecaa17c99919b3c72ebb23856
[log]
author: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Sat Feb 05 01:18:06 2022 +0000
committer: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Sat Feb 05 01:18:06 2022 +0000
tree: 216d9589fc778f344d1ccb31aa54973c01e743a5
parent: eb631b179198d1c43b445b05f5a21da13f502d13 [diff]
parent: 19453f2d5a273f20fdcd224f8f2dcf735aac414d [diff]

Merge cherrypicks of [15940261] into sc-qpr1-d-release.

Change-Id: I63e7dff5511e9e09acf549f326d16b0670858aef

tree: 216d9589fc778f344d1ccb31aa54973c01e743a5