tree 077dea5687e4d70f419feddf6a5a969dab3570d1
parent d4e877ea895535356fa6d2f9c6fe991278f6ebad
parent 95e0e08f61baae52ba77f9e5dd7c81139d5c4055
author Hugo Benichi <hugobenichi@google.com> 1494815204 +0000
committer android-build-merger <android-build-merger@google.com> 1494815204 +0000

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

Change-Id: I59a4d6daa591e577b6fd8e421c4f8fa5e26224d3