Merge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev

author Svetoslav Ganov <svetoslavganov@google.com>

Thu, 13 Oct 2016 20:06:00 +0000 (20:06 +0000)

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

Thu, 13 Oct 2016 20:06:02 +0000 (20:06 +0000)
author Svetoslav Ganov <svetoslavganov@google.com>
Thu, 13 Oct 2016 20:06:00 +0000 (20:06 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 13 Oct 2016 20:06:02 +0000 (20:06 +0000)
diff --cc core/res/AndroidManifest.xml
Simple merge
author	Svetoslav Ganov <svetoslavganov@google.com>
	Thu, 13 Oct 2016 20:06:00 +0000 (20:06 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 13 Oct 2016 20:06:02 +0000 (20:06 +0000)