summaryrefslogtreecommitdiff
path: root/libs/gui/ISurfaceComposer.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-05 22:53:45 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-04-05 22:53:45 +0000
commite343658087dfe853198ea15da8dfd7c2efc30a3e (patch)
tree240a8ddafbf13d267718ddf7bc1e595497185d79 /libs/gui/ISurfaceComposer.cpp
parentabaee69c7a65e0f824e9a0430bc10522f3ac5a86 (diff)
parent4605794f8adfba18e82f496bb8ce32900b64e56a (diff)
Merge changes from topic "am-b2f392edf061412196627ca584b13a2c" into tm-dev
* changes: [automerger skipped] Merge "DO NOT MERGE: SurfaceFlinger: Add Transaction#sanitize" into sc-qpr1-dev am: 7c8d637adf -s ours am: 35810e0967 -s ours am: 2b6cccf438 -s ours [automerger skipped] DO NOT MERGE: SurfaceFlinger: Add Transaction#sanitize am: 842a412840 -s ours am: 015db7e23e -s ours am: a94bffe370 -s ours
Diffstat (limited to 'libs/gui/ISurfaceComposer.cpp')
0 files changed, 0 insertions, 0 deletions