tree 7083179c4502bafa1eecfc502d7f7c6bd1d60c6f
parent cbec98fb1540c9aca7d5656ba4f59503a972b33c
parent 335a1d36eab391e750b210ec1f00f1da014271f5
author Hugo Benichi <hugobenichi@google.com> 1496807652 +0000
committer android-build-merger <android-build-merger@google.com> 1496807652 +0000

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

Change-Id: Ib6285780806a9bbffc9bb302085e78f72c27b1be