tree a1b228d70548b6e89a2dd8fdbe3683ce1f5a7d3b
parent b481c6d7eac68367ba46bc47ca81db561f4c24cc
parent 87d7badd662aa84369b2b9893e990cb24197ad24
author Ningyuan Wang <nywang@google.com> 1507182910 +0000
committer android-build-merger <android-build-merger@google.com> 1507182910 +0000

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

Change-Id: I0839f314c88b32e141e9995832bfd07a42e16d12