summaryrefslogtreecommitdiff
path: root/libs/input/PointerController.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-08-22 23:51:29 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-22 23:51:29 +0000
commit182f415a678c32cb40a84aeb2cd5381e321dba93 (patch)
treea6cdbba94c907f16f0aee1359e91be19aedbe8d2 /libs/input/PointerController.cpp
parentb10a5d4dddd24f4de48e2a6af219ac87093ddc3d (diff)
parentb9037aebd89cddc9439cd159609fe3684f627049 (diff)
[automerger skipped] [conflict] Merge "Do not send AccessibilityEvent if notification is for different user." into qt-dev am: dedf573b23 am: a8fe3a8f50 -s ours am: 87755b712a -s ours am: e718b4ef20 -s ours am: cc809ffb8a -s ours am: 066e4983c0 -s ours am: 57c20cfad4 -s ours am: 70e548140b -s ours am: 25601eb7a0 -s ours am: 1c0528d3a5 -s ours am: b9037aebd8 -s ours
am skip reason: Merged-In I62a875e26e214847ec72ce3c41b4f2fa8e597e07 with SHA-1 a367c0a16a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19680844 Change-Id: Icfeb3774b24f8833c18c60641e62761de74c43f7 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