Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev-plus-aosp

am: 44d0cda8ef

Change-Id: I5bf2282984b9ed40d838cb6ae30c4ab694a8e160

diff --cc packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
index a7e1490,be74a48..be87ed2
--- 1/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
--- 2/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
+++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
@@@ -57,8 -58,8 +58,9 @@@ import java.net.URL
  import java.lang.InterruptedException;
  import java.lang.reflect.Field;
  import java.lang.reflect.Method;
+ import java.util.Objects;
  import java.util.Random;
 +import java.util.concurrent.atomic.AtomicBoolean;
  
  public class CaptivePortalLoginActivity extends Activity {
      private static final String TAG = CaptivePortalLoginActivity.class.getSimpleName();