summaryrefslogtreecommitdiff
path: root/libs/input/PointerController.cpp
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2023-09-16 03:30:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-16 03:30:13 +0000
commit7603a030f01962d414f6d98ab03545d715e58d92 (patch)
tree46177c9a7701d44dcb37c891ce9e0694a6d66320 /libs/input/PointerController.cpp
parent0d5b8da4d305eba5d4086536f4792bfdd52d771f (diff)
parent5f0bcdfad926faacb39d564576225759c8f9b60d (diff)
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033ba am: 4397e74103 am: 89a3862e5d am: 8aaad2a211 am: c4e7a6081e am: 17405aa591 am: 13f4d4f471 -s ours am: aa805d1ff6 -s ours am: 33759f925a -s ours am: 2eca34e02d -s ours am: 5f0bcdfad9 -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24341230 Change-Id: I10e417b18e1ef9e190a283d2f4ef37f0f95b1ef1 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