tree f3fd1c98c074eb5b8841f69af1087b1471f4244a
parent 2b64c873662863ffb95ef1bbaae4b0598f047a43
parent 6f2d79464da65f1d617fbaae7583729a551fb7b8
author Hugo Benichi <hugobenichi@google.com> 1496804175 +0000
committer android-build-merger <android-build-merger@google.com> 1496804175 +0000

Merge "Captive portal login shows specific network name" am: ea7322d17e am: d4cb33b83f
am: 6f2d79464d

Change-Id: I88dc4240bc4a8eb84bc3edd7a9f5a873296075fd