OSDN Git Service

resolve merge conflicts of 94c5202965 to oc-dr1-dev
authorPhil Weaver <pweaver@google.com>
Tue, 29 Aug 2017 20:36:21 +0000 (13:36 -0700)
committerPhil Weaver <pweaver@google.com>
Wed, 30 Aug 2017 22:57:39 +0000 (22:57 +0000)
commitf65e790ba00436cf5f21c6a78261395dc086cea2
tree5c7814412a5da694df1524d2cea3a822e7ff538b
parent683fdb817727a413379997a0888afd305bc2cd40
parent94c52029653426846c50c639e7f6b5404cedd472
resolve merge conflicts of 94c5202965 to oc-dr1-dev

Bug: 62196835
Test: I solemnly swear I tested this conflict resolution.

Merged-In: I7c8d8b4143a5dd1cb684c31c4503608c8d5be0e3
Change-Id: I1bd77f165d1206ea139961bc0c42ad74c1d4bfaf
AndroidManifest.xml
src/com/android/settings/accessibility/AccessibilityServiceWarning.java
src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java