automerge: 7a3b253
* commit '7a3b253f086150ab030db967862002795a29bb83':
Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity
automerge: 7a3b253
* commit '7a3b253f086150ab030db967862002795a29bb83':
Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity