tree f24768cb6a10a858a9e432d885995f8a8fa2af14
parent 8cfd6178bc753b88ae7982616eb60e9b3f02ff92
parent f2a2e42bd01e46d5eec7419777c4c43d86b60f5e
author Rebecca Silberstein <silberst@google.com> 1538437817 -0700
committer android-build-merger <android-build-merger@google.com> 1538437817 -0700

[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a am: 8c71ef4f2e  -s ours am: 6c0b196b2e  -s ours
am: f2a2e42bd0  -s ours

Change-Id: Ib70749e2242cfb515171a209bec953fbece35b92