summaryrefslogtreecommitdiff
path: root/libs/input/PointerController.cpp
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2022-06-29 03:26:39 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-29 03:26:39 +0000
commit1b1f8a4221cc263e76242ac1565f28fb5de9a745 (patch)
treedbe753cd8daa0655c19b067b644e0fd1f19c93e8 /libs/input/PointerController.cpp
parentdbeeebaa80f00abb7c4be2bb5727713575596783 (diff)
parentcbe0f01ba8814ffa60324d48c7208d24d0809537 (diff)
[automerger skipped] Merge changes from topic "revert-16575908-dont_abandon_child_qt_dev-VVMFNIYZZO" into qt-dev am: 63257e0e97 am: 78bdbdd22e am: 1cad7c909a am: cc020a2462 -s ours am: c015bacf14 -s ours am: 5c96fe6b3b -s ours am: 61581156d5 -s ours am: cbe0f01ba8 -s ours
am skip reason: Merged-In I91170ba399b3a596320b3bd9c8188912e5c4f1be with SHA-1 7cd25e1f63 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19092695 Change-Id: Ic29532209eef2bf1b1c3b7d938883a98624f6286 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