Roshan Pius 3d981130f4 Merge "WifiManager(aidl): Remove pingSupplicant binder call" am: 3777874320 am: 673de5b39d ...

am: d0919ba9c4

Change-Id: Ia955905826f7b7a2219086121212f4498ca92993

2017-03-28 07:58:32 +00:00

..

java/android/net/wifi

Merge "WifiManager(aidl): Remove pingSupplicant binder call" am: 3777874320 am: 673de5b39d

2017-03-28 07:58:32 +00:00

tests

Merge "Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data" am: 44ef19d131 am: aadbb2d45e" into nyc-mr2-dev-plus-aosp

2017-03-23 23:13:32 +00:00