tree e54c9f3a05b1bcb87d1fe029b63309697ab64e10
parent 74217dfeba895e32363c6512f0bc391bab863c03
parent cf146edb327f29412d63188687cc258eda1dceb8
author Svetoslav Ganov <svetoslavganov@google.com> 1476455502 +0000
committer android-build-merger <android-build-merger@google.com> 1476455502 +0000

Merge "Allow SetupWizard to do WiFi scans if location off" am: c98b34bdce am: 72510e6244
am: cf146edb32

Change-Id: Icb456bac6bf5bf357848d73356adbd8772c37817