tree fa7588dabd922bce018cd2ba86be9229f6a01446
parent fc0f68ca518dd3bdfc9c5225a55c2e9178c7b160
parent 6405b98114bce0cbce4c9cd11f8b42748dcaaf0b
author Peter Qiu <zqiu@google.com> 1478817839 +0000
committer android-build-merger <android-build-merger@google.com> 1478817839 +0000

Merge "wifi: hotspot2: add Passpoint APIs to WifiManager" am: 0295d7bd38 am: 5451f8279e am: 8e07f4a86e
am: 6405b98114

Change-Id: Ifb223a9c0573571875979a7f55e6ede53ac12a4e