summaryrefslogtreecommitdiff
path: root/libs/ui/Gralloc4.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-09 23:29:49 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-12-09 23:29:49 +0000
commit05ef8feae204b0d2f95f92c2ca0245b0cb041881 (patch)
treea0f2d388c7ebbf85994d7b48063409cd927c3ff2 /libs/ui/Gralloc4.cpp
parent963046032305c4b0eb6b2dc0de036af0663e5bf2 (diff)
parent45f5d8ec847f24b2c15aa4b651a199f688cb4765 (diff)
Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master
* changes: [automerger skipped] Merge "Merge Android 13 QPR1" am: 162c56b514 -s ours [automerger skipped] Merge Android 13 QPR1 am: 603e866896 -s ours
Diffstat (limited to 'libs/ui/Gralloc4.cpp')
0 files changed, 0 insertions, 0 deletions