From: Chen Xu <fionaxu@google.com>
Date: Mon, 10 Jul 2017 21:00:27 +0000 (+0000)
Subject: Merge "fix cellular captive portal reevaluation url" into oc-dr1-dev
X-Git-Tag: android-x86-9.0-r1~1030^2~215
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=08bccd3b2086fc3ecba41781232d99cac6367bc0;p=android-x86%2Fframeworks-base.git

Merge "fix cellular captive portal reevaluation url" into oc-dr1-dev
am: 037503dfa0

Change-Id: I008839786c3557f3dd418f8bb82f1cea0c27d3a1
---

08bccd3b2086fc3ecba41781232d99cac6367bc0