summaryrefslogtreecommitdiff
path: root/libs/input/PointerController.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-01-18 21:26:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-01-18 21:26:44 +0000
commit54238887360debc689bb7a1a180f000919d6636b (patch)
tree7ede11880b658bbd1651ac34ddb0514db0ee8d68 /libs/input/PointerController.cpp
parent6f3cd4e8d2a31ca0a029d759ab5df0b4f4fa3c39 (diff)
parent88e3bfc00838d83e640c899b6f55fe391dec05e0 (diff)
[automerger skipped] Merge "Merge "Revert "Making adapter child views in RemoteCollectionItemsAdapter size-aware"" into android14-tests-dev am: 679d9285b9" into main am: 6b55c28f0f am: 88e3bfc008 -s ours
am skip reason: Merged-In I0eedf4574975bfae88801e0153816135fc1c8181 with SHA-1 dc464d6e52 is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2912083 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2915243 Change-Id: I8f778d96b6b220184ec99cfcff1b443475e4eae8 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