summaryrefslogtreecommitdiff
path: root/libs/gui/SurfaceComposerClient.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2022-12-10 00:24:56 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-10 00:24:56 +0000
commit34e3e944627a992840b97c716f013d4715e844ba (patch)
tree1af66704e7cae0602d3b8d82f1759147160708d3 /libs/gui/SurfaceComposerClient.cpp
parent8cc04a8401236a62865716284629a6191dfc0af5 (diff)
parentb2796a1bf1a0916845c51e5426c7bdf76fdf6594 (diff)
[automerger skipped] Merge Android 13 QPR1 am: 603e866896 -s ours am: b2796a1bf1 -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: Id43c22043da2a202b4e372b52d365b1870279270 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