tree 9469d52e32de29fcce38fe435928ab4af9c41c79
parent 5a184b6572a98674ea6a4e0955c3c900aadb3a84
parent fdb0a13a762e140712ea1632f736da97c6c73509
author Roshan Pius <rpius@google.com> 1497390364 +0000
committer android-build-merger <android-build-merger@google.com> 1497390364 +0000

Merge "WifiManagerTest: Set key mgmt field in testWifiManagerNetWork" into oc-dr1-dev
am: fdb0a13a76

Change-Id: I653899bcd5b92744aadd8feb906550fc53404f4a