tree 403ee4dc18df875784f60d6670114c6880fd1316
parent 3bd823f2ca68e508a8d406a85cdc46e2d905a7e1
parent a442338fbb51bc797ab03eca48d3b0bc0c454e2e
author Roshan Pius <rpius@google.com> 1590941985 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1590941985 +0000

Merge changes I514b5b3a,Id67082c5 into rvc-dev

* changes:
  ClientModeImpl: Ignore connect when connecting to network
  WifiDiagnostics: Add a timeout for logcat calls