tree 194cace5ac6bdbdc9005064a44c9436cdce6fa63
parent 1948af7bd096b1bc12b77d80b6e371a18525cc41
parent 8bc542695c2796fd26d230b86b5f2628ddb9fd1c
author Hugo Benichi <hugobenichi@google.com> 1496309931 +0000
committer android-build-merger <android-build-merger@google.com> 1496309931 +0000

Merge "Prettify the captive portal sign-in activity" into oc-dev
am: 8bc542695c

Change-Id: Id655667e19c2ddc65a3d3deb6a447850ec02e90c