Merge "Developer settings: Disable wifi scan throttling" into qt-dev

author Roshan Pius <rpius@google.com>

Tue, 28 May 2019 23:25:30 +0000 (16:25 -0700)

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

Tue, 28 May 2019 23:25:30 +0000 (16:25 -0700)
author Roshan Pius <rpius@google.com>
Tue, 28 May 2019 23:25:30 +0000 (16:25 -0700)
committer android-build-merger <android-build-merger@google.com>
Tue, 28 May 2019 23:25:30 +0000 (16:25 -0700)
diff --cc res/xml/development_settings.xml
Simple merge
diff --cc src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
Simple merge
author	Roshan Pius <rpius@google.com>
	Tue, 28 May 2019 23:25:30 +0000 (16:25 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 28 May 2019 23:25:30 +0000 (16:25 -0700)
		1	2
res/xml/development_settings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java	patch \|	diff1 \|	diff2 \|	blob \| history