tree 32bbd7ad12516e2f72fdf9b3cdb295b30e0bd244
parent 6f2d79464da65f1d617fbaae7583729a551fb7b8
parent 24912bb93d3820ab8b33beff291ecdd27fcf99a1
author Hugo Benichi <hugobenichi@google.com> 1496806873 +0000
committer android-build-merger <android-build-merger@google.com> 1496806873 +0000

Merge "Revert "Captive portal login shows specific network name"" am: 7f423d00dd
am: 24912bb93d

Change-Id: Ief5a666699e64cf5d5fc79de1b7964f473898f78