summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Martin Stjernholm <mast@google.com> 2023-08-17 14:32:01 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-17 14:32:01 +0000
commit4026cdd0b2f94eeb9fd9f82d69cacf388ea33457 (patch)
tree757cdef6fcb144eb55063e3b19b51fc0374fa532 /libs/gui/ConsumerBase.cpp
parent5f11fc11a364d2c01d89ca11667601bf1f1ce702 (diff)
parent80b1122570dc3ca9669f0758c98a909be667bbd1 (diff)
[automerger skipped] Merge changes from topic "cherrypicker-L15700000962481002:N29300001395174087" into udc-qpr-dev am: 80b1122570 -s ours
am skip reason: Merged-In Ie4e29beaee398428680a0c003f7cb01f2cdd76f9 with SHA-1 47a9d99468 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24370136 Change-Id: If5ddd1f1cdd8778cd885bf76253b0546be273ac1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
0 files changed, 0 insertions, 0 deletions