Merge "Add a layer of indirection to wifi settings" into pi-car-dev
am: a7f7ea9adc

Change-Id: I4e1da567d69213995a7d7fc38058edc24fed8516
tree: 73ad2acc875eb51ceaafe828dd5c9ffb76b57720
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg