OSDN Git Service

Merge "wifi: allow manual connection to a Passpoint provided network" into oc-dev
authorPeter Qiu <zqiu@google.com>
Wed, 5 Apr 2017 21:25:02 +0000 (21:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Apr 2017 21:25:02 +0000 (21:25 +0000)
am: 248c04001e

Change-Id: I96798d7c1ad75210e0484e818ba3982b713a46f7


Trivial merge