summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Martin Stjernholm <mast@google.com> 2023-08-17 15:00:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-17 15:00:00 +0000
commit00a930ea593a5b740cf4204fd26c75bb27074c6a (patch)
tree164d75a0446e56fe3e9f182f52e4e57eab2f40c7 /libs/gui/ConsumerBase.cpp
parent15bec5470df65115393d7233c832e5de4eec6aac (diff)
parent4026cdd0b2f94eeb9fd9f82d69cacf388ea33457 (diff)
[automerger skipped] Merge changes from topic "cherrypicker-L15700000962481002:N29300001395174087" into udc-qpr-dev am: 80b1122570 -s ours am: 4026cdd0b2 -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: I696a6cba2597f26e6ee80c9a3e438b3ea415d96c 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