From: Dan Albert <danalbert@google.com>
Date: Thu, 24 Jan 2019 21:49:58 +0000 (-0800)
Subject: Merge "Revert "Update to use new ConnectivityManager API."" am: 9c7ddce334
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=11247ebb530d22882c306a1abfe68322068196d7;p=android-x86%2Fpackages-apps-Settings.git

Merge "Revert "Update to use new ConnectivityManager API."" am: 9c7ddce334
am: 2105dc52dd

Change-Id: I15aa3b38af77c6e222db38b89e3f29562437f4dd
---

11247ebb530d22882c306a1abfe68322068196d7