DO NOT MERGE: Only select Wi-fi when needed
am: 40408b76ea

Change-Id: I513d04e929f4e8243c1b765f53ef5c3550a94165
tree: b4d3fb65f023d7847172360e197ae1cf9ef759ed
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. CleanSpec.mk