Peter Qiu b1aff6b190 Merge "Merge "wifi: add a flag indicating legacy Passpoint configuration" am: 2d87679a11 am: 1228b6cdec" into nyc-mr2-dev-plus-aosp ...

am: 01213393fb

Change-Id: Ic5ea3f8c8521e818ee771b20cdb4d43875d6daa7

2017-03-16 23:54:12 +00:00

..

java/android/net/wifi

Merge "Merge "wifi: add a flag indicating legacy Passpoint configuration" am: 2d87679a11 am: 1228b6cdec" into nyc-mr2-dev-plus-aosp

2017-03-16 23:54:12 +00:00

tests

frameworks/base: Add APCT tests to the device-tests suite.

2017-03-15 14:46:27 -07:00