diff options
| author | 2022-09-07 12:40:46 +0000 | |
|---|---|---|
| committer | 2022-09-07 12:40:46 +0000 | |
| commit | 9956179212ad7a1fb078eb613d4d1d84b9a198ce (patch) | |
| tree | ce1c351bbaa721a13972a2446a58fd5171a5a871 /libs/input/PointerController.cpp | |
| parent | 814a66115d60ac7f0b666499555f1bf127bc20b6 (diff) | |
| parent | d2b660e2adeab396fa92b3720140e077190a1b5c (diff) | |
Merge changes from topic "am-f1f0777dd35b4d0b883d9a4fe3b359b4" into tm-d1-dev-plus-aosp am: d2b660e2ad -s ours
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641683
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19748522
Change-Id: I2fdac69773abeab8bbe6670794045fdcd2af2175
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