diff options
| author | 2022-08-22 23:50:46 +0000 | |
|---|---|---|
| committer | 2022-08-22 23:50:46 +0000 | |
| commit | b10a5d4dddd24f4de48e2a6af219ac87093ddc3d (patch) | |
| tree | a6cdbba94c907f16f0aee1359e91be19aedbe8d2 /libs/input/PointerController.cpp | |
| parent | 460aa22e4e0054203527751f8ef1329eecd2a096 (diff) | |
| parent | 9cb57b1981b3d2bbb948e969ef5dac61773febdf (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: af7787b53c -s ours am: 64d1908b86 -s ours am: 2e13e27a0c -s ours am: d7331b8b86 -s ours am: 9cb57b1981 -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: I1fceecdfb8d1eb34314a03b001fb218de67b4a45
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