summaryrefslogtreecommitdiff
path: root/libs/ui/Gralloc2.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-12 13:50:49 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-12 13:50:49 +0000
commit80ecd60b6b703cd743c32404078e38d35b6add39 (patch)
tree551c88a0d5c7ccae6fb38e2f4869fa30e949848f /libs/ui/Gralloc2.cpp
parentbc2f1fec7220fde5ac6c9946e9a3c3e3c9877bcb (diff)
parentffd13f00067b341a64790951b3123ed1ea21f755 (diff)
[automerger skipped] Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: 05ef8feae2 -s ours am: ffd13f0006 -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: I2455f15450377cf68eb0e33b3f7687362b60e164 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/ui/Gralloc2.cpp')
0 files changed, 0 insertions, 0 deletions