tree 8d31536169026f329539e628b89d58975efc00fb
parent 6d392a77faf40a6ce43e4e0f8545b543afd88e73
parent e8e50a81adc0ffbb4a074012d05cf0b57f4f81a6
author Svetoslav Ganov <svetoslavganov@google.com> 1476390433 +0000
committer android-build-merger <android-build-merger@google.com> 1476390433 +0000

Merge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev am: cba436b312 am: 8d3fc0fd8a
am: e8e50a81ad

Change-Id: I22d1f733fdab84f3d83076eb9dd36260d5a7d194