OSDN Git Service

Merge "Fix CaptivePortalLoginActivity probes to bypass Private DNS" am: ec629e2f43
authorErik Kline <ek@google.com>
Thu, 26 Apr 2018 05:39:31 +0000 (22:39 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Apr 2018 05:39:31 +0000 (22:39 -0700)
commit289d5298eda5887e7ecfa7131ccc0bf9423c8613
tree63b1ce378c2fbfa11499a9f25922251fed720b4b
parentc310569072694667d5a9123a54a5bab8c2239c50
parent66d8d2a5b668230fb8106f600c9e9354d015b912
Merge "Fix CaptivePortalLoginActivity probes to bypass Private DNS" am: ec629e2f43
am: 66d8d2a5b6

Change-Id: I749e8b5dba3b4af9ecb82bfb558c6f0e664531a4
packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java