| commit | bc02401e10f346ef75257539c26195a7f7b32752 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jan 07 18:57:07 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 07 18:57:07 2022 +0000 |
| tree | c3c668a9ce51a1d8c5d02b9b3b2a2159ab6fa30f | |
| parent | a3d378df3f83710284987baaf6d0c02a332218bd [diff] | |
| parent | 051b8fa187a133d1cea5dcc7a22308d0f6d37fc4 [diff] |
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: a477f831a3 -s ours am: a6fd667621 -s ours am: 14d2209075 -s ours am: 051b8fa187 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1940721 Change-Id: If5c758a22b2edce88705cefe14f6473c1be73e8e