Merge "Do not trigger scan for reconnect() when wifi is connected" into oc-mr1-dev
am: 562c1e6a9a

Change-Id: I0839f314c88b32e141e9995832bfd07a42e16d12
tree: 316cb5b242b6442bace5af0ad037096a507a3be0
  1. service/
  2. PREUPLOAD.cfg