OSDN Git Service

Merge "Captive portal: fix probe urls at network creation" am: 923ef69ae7 am: 65fa067...
authorHugo Benichi <hugobenichi@google.com>
Wed, 12 Apr 2017 10:11:41 +0000 (10:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 10:11:41 +0000 (10:11 +0000)
am: 3bc2ac3f82

Change-Id: I0811f7f36dc8ec6d1312d21660abce77bba7a47f


Trivial merge