summaryrefslogtreecommitdiff
path: root/libs/gui/SurfaceComposerClient.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2022-12-10 00:27:45 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-10 00:27:45 +0000
commita4c9bd4b14ec6e2916ddba55c1727a1ed93c84f1 (patch)
tree1af66704e7cae0602d3b8d82f1759147160708d3 /libs/gui/SurfaceComposerClient.cpp
parent34e3e944627a992840b97c716f013d4715e844ba (diff)
parent963046032305c4b0eb6b2dc0de036af0663e5bf2 (diff)
[automerger skipped] Merge "Merge Android 13 QPR1" am: 162c56b514 -s ours am: 9630460323 -s ours
am skip reason: Merged-In Id5cff8223ad6f0463caf9a81e21e40317ada2d23 with SHA-1 215468a1f4 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2338192 Change-Id: I6c4fd960525c7408aea0aaf1ddb72bdbc86e63ef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/gui/SurfaceComposerClient.cpp')
0 files changed, 0 insertions, 0 deletions