Amin Shaikh b858ffbe42 Merge changes from topic 'disabled-reason' ...

am: d0fc3f1383

Change-Id: I09e7dff673a56fb3c51cde827ae783da32407a70

2017-02-23 20:35:10 +00:00

..

java/android/net/wifi

Merge changes from topic 'disabled-reason'

2017-02-23 20:35:10 +00:00

tests

Fix failing WifiConfigManagerTest test.

2017-02-23 10:29:10 -08:00