tree 5afcfb11cb0a99e13352c3c5066e2be46b136a84
parent 8cb0abe863b075c8a30d02c78dd250ad72f33495
parent b15a70deb446d69bba988edbeb4f0c904ea9db66
author Hugo Benichi <hugobenichi@google.com> 1494816052 +0000
committer android-build-merger <android-build-merger@google.com> 1494816052 +0000

Merge "CaptivePortal: login activity UI improvements" am: cb570ec50a am: 95e0e08f61 am: 2bf886d648
am: b15a70deb4

Change-Id: I77c6e2c062d9c6b73f976b74b6c6fd3b94f5ee4c