tree 59d236a3d66d9ff2efe43dc7fcc19c0b86cc6fa6
parent 9b3d12c7bb03249f3b07dbe77338a73cba0b5791
parent f0b2ed9e6701e7eb2457b0fd6137af5cf4e3efbc
author Cassie <xih@google.com> 1522778205 -0700
committer android-build-merger <android-build-merger@google.com> 1522778205 -0700

Merge "Remove the use of new NetworkScan API in old Auto-select Network UI." am: 86327b8b52
am: f0b2ed9e67

Change-Id: I70b2aa88f23bdf80f441e3aa4730182ed62b86c3