diff options
| author | 2024-09-25 19:50:17 +0000 | |
|---|---|---|
| committer | 2024-09-25 19:50:17 +0000 | |
| commit | 5f481679c659165fbf452ccac92527a4f10b830d (patch) | |
| tree | 1163356756ed605e5e0ca88cf1d64c3bc6656c76 /libs/gui/BufferQueueThreadState.cpp | |
| parent | c98a74b3e283b620f20e77e909bc5de88f1608f7 (diff) | |
| parent | 94fd1581ec61f385ed2bee3be5c2e947cb749e07 (diff) | |
[automerger skipped] Merge changes from topic "am-7d5e5bd2fc184e2ebbab7c487e278d31" into main am: 2a7388a6e3 -s ours am: 94fd1581ec -s ours
am skip reason: Merged-In Ic5b2b298fe0df357f77ef8f06b1fc0fc248e0498 with SHA-1 12b90231b4 is already in history. Merged-In was found from reverted change.
Reverted change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3275058
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3276053
Change-Id: I05f21a173bed88627f6c6a8ab69f177487f09e6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/gui/BufferQueueThreadState.cpp')
0 files changed, 0 insertions, 0 deletions