OSDN Git Service

Merge "Manual merge of ag/2319717"
authorPhil Weaver <pweaver@google.com>
Tue, 30 May 2017 19:46:17 +0000 (19:46 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 30 May 2017 19:46:18 +0000 (19:46 +0000)
commit64822d40dcf3d7bf85811c5d906fabe64a1f4f16
treeb78e21dc63c63e1389a2487a7db3489d28269341
parent5d2377f66ad83f02693c977d1f20de19120a0937
parent2e2dbfe549d6803483d509b62538a875de433151
Merge "Manual merge of ag/2319717"
AndroidManifest.xml
src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java