tree 9a28904217c0d0e194725c20e15bc52ea934d527
parent b5093966bd03251f42d67923b223b187d6b83d24
author vandwalle <vandwalle@google.com> 1418176355 -0800
committer The Android Automerger <android-build@google.com> 1418597316 -0800

autojoin scanning + P2P
- discard autojoin scan when both infra and P2P are connected
- reduce autojoin scan period when P2P is connected and infra is disconnected
Bug:18692653

Change-Id: Id1891e6a9f2863d8876915cfefd158fb1712b8fe