tree 60483f828683083107f81d075a819b3070b73081
parent c16b8a3b4c149f74ff5cda98cf2188906f984fe7
parent 4f9e934c5f867825e345eb1d4b6bebb7f03b877d
author Hugo Benichi <hugobenichi@google.com> 1489055016 +0000
committer android-build-merger <android-build-merger@google.com> 1489055016 +0000

Merge "CaptivePortalLoginActivity correctly gets UserAgent" am: 4903487fd9 am: 43961ee6ae
am: 4f9e934c5f

Change-Id: I234d55c758c7538717d27035fdc8864a8650d75c