tree e338ebf50438537f4cebf60ab6f9a33f26c4b199
parent f6b27fbff0f7130c704e5a50fa7c98a00855d332
parent 3d70baf5ff7d26581766f56407103fbc163cdf7e
author Chalard Jean <jchalard@google.com> 1537494092 -0700
committer android-build-merger <android-build-merger@google.com> 1537494092 -0700

Merge "Fix NullPointerException in CaptivePortalLogin" am: d106aac67b
am: 3d70baf5ff

Change-Id: I88af0e651307b48421047098833d28b97f57dd54