tree 008d02ec74686f102bdd69d5d4bf78075d8895a7
parent bf6ddb73d435db9b7b3983d889e6ec789fdbf221
parent 340047b18cd716c5aa3e26cbb697aad80e6637f6
author Rebecca Silberstein <silberst@google.com> 1538431917 -0700
committer android-build-merger <android-build-merger@google.com> 1538431917 -0700

Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev
am: 354de98f9a

Change-Id: I4b8dd8fbb8e4765cba4e95e521f528f6dd752df3