OSDN Git Service

[automerger skipped] Merge "Fix CaptivePortalLoginActivity probes to bypass Private...
authorErik Kline <ek@google.com>
Thu, 26 Apr 2018 07:44:25 +0000 (00:44 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Apr 2018 07:44:25 +0000 (00:44 -0700)
commit8dfe1824475b2f08bc23fd70a258f35ffa55625c
tree63b1ce378c2fbfa11499a9f25922251fed720b4b
parent289d5298eda5887e7ecfa7131ccc0bf9423c8613
parent45a3a6ec33386ceefe3d110f0c9f388c20a2c075
[automerger skipped] Merge "Fix CaptivePortalLoginActivity probes to bypass Private DNS" into pi-dev
am: 45a3a6ec33  -s ours

Change-Id: Ief0679f560a683d03aa3e2d18494fd648819e4a9