From: Remi NGUYEN VAN <reminv@google.com>
Date: Mon, 25 Mar 2019 03:10:38 +0000 (-0700)
Subject: [automerger skipped] Merge "Fix API in CaptivePortal and ConnectivityManager" am... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1bf2ef3bc3a503573dafa7b139288223b6618fbf;p=android-x86%2Fframeworks-base.git

[automerger skipped] Merge "Fix API in CaptivePortal and ConnectivityManager" am: 3c959339ae am: 79f2cf93d2
am: cd08ecfdfd -s ours
am skip reason: change_id I09545c00af3519dbf141dd5951b28f49e37b3e80 with SHA1 24ec3ff006 is in history

Change-Id: I793a60492ba7b63c6dea2937e7fc651a1ab617b9
---

1bf2ef3bc3a503573dafa7b139288223b6618fbf