| commit | 6950ec79d7e4e4b33357737bb718d6f6b7f3546a | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Mon Oct 09 20:37:31 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 09 20:37:31 2023 +0000 |
| tree | 72fc48d3536042748b1ac98d9acb9a66ac0a01f9 | |
| parent | c2ce885fb729c451a48aa30098570d54c8ca1727 [diff] | |
| parent | f51381b55e26af9c21cc84886a397a3de94da589 [diff] |
[automerger skipped] Merge changes Iec1011a9,I64249876,Icb348a4a,Ibd46b7de,Ied45a5d7 into main am: 0381fe848c am: 80c1e0ce02 -s ours am: efe557d57e -s ours am: f51381b55e -s ours am skip reason: Merged-In Iec1011a9f6dc9088c5254fd10ae27f526defd490 with SHA-1 12dcf8670e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2778288 Change-Id: I878900a4b80e86d5906869a0a132f63717c69319 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>