Merge "Developer setting to enable notification channel warnings" into oc-dev am...

author Geoffrey Pitsch <gpitsch@google.com>

Tue, 23 May 2017 15:26:39 +0000 (15:26 +0000)

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

Tue, 23 May 2017 15:26:39 +0000 (15:26 +0000)
author Geoffrey Pitsch <gpitsch@google.com>
Tue, 23 May 2017 15:26:39 +0000 (15:26 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 15:26:39 +0000 (15:26 +0000)
diff --cc res/xml/development_prefs.xml
Simple merge
diff --cc src/com/android/settings/development/DevelopmentSettings.java
Simple merge
author	Geoffrey Pitsch <gpitsch@google.com>
	Tue, 23 May 2017 15:26:39 +0000 (15:26 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 23 May 2017 15:26:39 +0000 (15:26 +0000)
		1	2
res/xml/development_prefs.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/development/DevelopmentSettings.java	patch \|	diff1 \|	diff2 \|	blob \| history