Merge "Get rid of charging sounds toggle" into pi-dev

author TreeHugger Robot <treehugger-gerrit@google.com>

Tue, 17 Apr 2018 19:13:11 +0000 (19:13 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 17 Apr 2018 19:13:11 +0000 (19:13 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Tue, 17 Apr 2018 19:13:11 +0000 (19:13 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 17 Apr 2018 19:13:11 +0000 (19:13 +0000)
diff --cc res/xml/sound_settings.xml
Simple merge
diff --cc src/com/android/settings/notification/SoundSettings.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Tue, 17 Apr 2018 19:13:11 +0000 (19:13 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 17 Apr 2018 19:13:11 +0000 (19:13 +0000)
		1	2
res/xml/sound_settings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/notification/SoundSettings.java	patch \|	diff1 \|	diff2 \|	blob \| history