summaryrefslogtreecommitdiff
path: root/libs/input/PointerController.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-10-19 01:01:41 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-19 01:01:41 +0000
commit305bdcef3145dc82ff0cf3b213424cbac223f551 (patch)
tree11eaf173f45325f2cc468fa25b9d2f27e496448e /libs/input/PointerController.cpp
parent0acdd8502857ed1f536a5f11fa1139ead49aef52 (diff)
parent208c7fbee845da089b8a3a7a1b290e9c4fcd5410 (diff)
[automerger skipped] Merge "[DO NOT MERGE] Fix conditionId string trimming in AutomaticZenRule" into qt-dev am: 600ecb01d0 am: f663191969 -s ours am: 31b5a32547 -s ours am: 2b0f37f228 -s ours am: 52b02cb87c -s ours am: 22f3caeea7 -s ours am: 3042eccc97 -s ours am: 1f11e0a932 -s ours am: 208c7fbee8 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20208339 Change-Id: I86f1694c0035d9a29d9d650b2b60d8b6b12d1e12 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