Fwk: Only chime when docked and accessbility is on am: cf11ceab65

author Vinod Krishnan <vinodkrishnan@google.com>

Fri, 21 Oct 2016 21:21:18 +0000 (21:21 +0000)

committer android-build-merger <android-build-merger@google.com>

Fri, 21 Oct 2016 21:21:18 +0000 (21:21 +0000)
author Vinod Krishnan <vinodkrishnan@google.com>
Fri, 21 Oct 2016 21:21:18 +0000 (21:21 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 21 Oct 2016 21:21:18 +0000 (21:21 +0000)
diff --cc core/java/android/provider/Settings.java
Simple merge
diff --cc packages/SettingsProvider/res/values/defaults.xml
Simple merge
author	Vinod Krishnan <vinodkrishnan@google.com>
	Fri, 21 Oct 2016 21:21:18 +0000 (21:21 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 21 Oct 2016 21:21:18 +0000 (21:21 +0000)
		1	2
core/java/android/provider/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/SettingsProvider/res/values/defaults.xml	patch \|	diff1 \|	diff2 \|	blob \| history