summaryrefslogtreecommitdiff
path: root/libs/hwui/FrameInfoVisualizer.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-22 09:09:25 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-22 09:09:25 +0000
commit27a462621c60fe5cddc114b5736c961c750d8c0a (patch)
treefe6393f5d1d9f5bae59926c1bdb9d1f2658fb4ba /libs/hwui/FrameInfoVisualizer.cpp
parentd43f495a4d6d240e70edd3732d0fd14adf14f1b9 (diff)
parentb8131bb401db469e2d0ee55ca67247379be313a6 (diff)
Merge "[automerger skipped] Merge "Handle waking from unlock in KeyguardViewMediator." into udc-dev am: 83270333ff am: 7db635ba43 -s ours am: 3e467247dc -s ours" into udc-qpr-dev-plus-aosp am: b8131bb401 -s ours
am skip reason: Merged-In Ia6fa9681be950adc1b9aae6f7abcd4d7f19db156 with SHA-1 3aa54b2e0f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24157194 Change-Id: I41c3adfa76d03298b8b925a744e9c36732815ccb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/hwui/FrameInfoVisualizer.cpp')
0 files changed, 0 insertions, 0 deletions