summaryrefslogtreecommitdiff
path: root/libs/gui/Surface.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2024-05-29 20:52:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-05-29 20:52:26 +0000
commitb08672fb85dfab79440cd9ba1a4422f52f7caaa9 (patch)
tree38dacfa3e86d9d9004ecef0b5ea11a8a002c94d1 /libs/gui/Surface.cpp
parent64e47d68a0881baec523e43653d674277f958cdf (diff)
parent4a733b374f5bd228e87aab70ced2ae579ac2009b (diff)
[automerger skipped] Merge "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future" into aosp-main-future am: 4a733b374f -s ours
am skip reason: Merged-In I8d975b81afd2cde1d543e8bc7e730a6e42393bec with SHA-1 787d302b3b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/27271408 Change-Id: I00ba4a356b0a772979407fcd891ac8c5e1ae2906 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/gui/Surface.cpp')
0 files changed, 0 insertions, 0 deletions