Merge "No factory reset when wifi connect fails during provisioning." into mnc-dev
tree: acd542a4b2e3ec6e8371b659054b649684c9edcb
  1. comm/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml