Mathew Inwood db7fd6ee9e resolve merge conflicts of 20fcc2eb4c to stage-aosp-master ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I9437532ae617eda28aa5ae796563e985cc0ddbca
Change-Id: Ifa50d21fb63b7ac73ab2ddaeebb1e01f535595c7

2018-08-02 17:39:43 +01:00

..

AccessibilityButtonController.java

…

AccessibilityService.java

resolve merge conflicts of 20fcc2eb4c to stage-aosp-master

2018-08-02 17:39:43 +01:00

AccessibilityServiceInfo.aidl

…

AccessibilityServiceInfo.java

resolve merge conflicts of 20fcc2eb4c to stage-aosp-master

2018-08-02 17:39:43 +01:00

FingerprintGestureController.java

…

GestureDescription.java

Magnification Gestures CTS test

2017-10-16 17:31:49 -07:00

IAccessibilityServiceClient.aidl

…

IAccessibilityServiceConnection.aidl

Prevent reporting fake package name - framework

2017-12-09 09:04:24 -08:00

package.html

…