commit | ab55336cc1702b13c107db65057ba5e5348960a9 | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 07 11:14:08 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 07 11:14:08 2024 +0000 |
tree | cad7b927b4156ae1f1c9caf03e6e57bcfd7b754e | |
parent | 8f20f0a1e654f2b82797d4e536dbe73bcbb36812 [diff] | |
parent | b246ef31bbabcbbe16c069e153b1105650646e1e [diff] |
[automerger skipped] [conflict] Merge "Merge "Test API's for mouse pointer speed" into android14-tests-dev am: 8ac722f263" into main am: 512528a732 am: b246ef31bb -s ours am skip reason: Merged-In Ie14a1522905d3de25d69f99029f75e47fa66aa5f with SHA-1 586387011d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26156237 Change-Id: Ib1389e7bb4d014f2888d740bdf07762d0f030ef0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>