tree 4c87898635fdefa66a0b7547ef28fe2987b0f134
parent 1cb86cc2349920925446de978be9c97614aa7cdb
parent 88d9f08c93df44ccd8f7171b7a99823773683605
author Rebecca Silberstein <silberst@google.com> 1497979826 +0000
committer android-build-merger <android-build-merger@google.com> 1497979826 +0000

Merge "WifiManagerTest: check softap mode supported" into oc-dev am: a2283cd312
am: 88d9f08c93

Change-Id: Idce7f7beeadb227dc4ec0855c3534acd2e8a8a6d