| commit | c97f029a144e87157b456f982123071fb5083894 | [log] [tgz] |
|---|---|---|
| author | Dorin Drimus <dorindrimus@google.com> | Mon Sep 26 17:48:20 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 26 17:48:20 2022 +0000 |
| tree | 3705a147579e7d8b0b7c6185951be10a2162d623 | |
| parent | 6843ceaf2fbfd7e2ff1a46f6bbcb738136dd96ab [diff] | |
| parent | 7bc2bc9d6d0f10bdd989d3940acf20cbeb82ecbd [diff] |
[automerger skipped] Merge "Do not support direct effect when the non-offload effect is enabled" am: 6f06559d28 am: 7aec4050f0 am: 50836f855c am: 7bc2bc9d6d -s ours am skip reason: Merged-In Ifa83be883c81925a757fd121f51c5d476fb9cdf8 with SHA-1 76e6957199 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2222744 Change-Id: Ia7ce696845871a635119e5f0d7428f77639a302c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>