am 7a8c9378: am 7e72d990: Merge "Allow goldfish-setup to put the emulator in...
am 7a8c9378: am 7e72d990: Merge "Allow goldfish-setup to put the emulator in WiFi-only mode" into mnc-dev
* commit '7a8c9378':
Allow goldfish-setup to put the emulator in WiFi-only mode