tree 299450c62effe8242ea42f3944414020ded1448c
parent f0b015d706551c0109a421dd075eef0c5b5faf86
parent 6e145ffb0e08d20283a02366bc3825b6cbf6b8a8
author Hugo Benichi <hugobenichi@google.com> 1496325136 +0000
committer android-build-merger <android-build-merger@google.com> 1496325136 +0000

Merge "Prettify the captive portal sign-in activity" am: 5dbdffbf81
am: 6e145ffb0e

Change-Id: I183a1c4e9b38b88c541eb3acf3412eb29744bd69