summaryrefslogtreecommitdiff
path: root/libs/input/PointerController.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-28 18:53:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-28 18:53:23 +0000
commit3dba814af8930112ae706453fdea68ba654ab055 (patch)
tree8669e49b83d0685c8d7bcd306fc485ea458b865b /libs/input/PointerController.cpp
parent66a2f5dc490f86e0a4773946adf18eda7c32157a (diff)
parent507ef45027408874382e1fd4bb405a6dd83bca9d (diff)
Merge "[automerger skipped] [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7 am: d78f1693ef -s ours am: 4b70b75d1c -s ours am: feba47c36a -s ours am: 0d3f936b8b -s ours am: 5387568458 -s ours am: bc66d3802b -s ours am: 93047c14a2 -s ours am: 9391e9be6b -s ours" into tm-d1-dev-plus-aosp am: 507ef45027
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20067847 Change-Id: Ib9277ee3810da598514d15ffba1469323ee90730 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/input/PointerController.cpp')
0 files changed, 0 insertions, 0 deletions