OSDN Git Service

Merge "wifi: add API for retrieving Hotspot 2.0 OSU providers" into oc-dr1-dev am...
authorPeter Qiu <zqiu@google.com>
Wed, 14 Jun 2017 19:28:40 +0000 (19:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Jun 2017 19:28:40 +0000 (19:28 +0000)
am: 43b1d48a10  -s ours

Change-Id: Ie42b1f88ae5aaef270b6af3b0307fa1ec5345473


Trivial merge