From: Roland Levillain <rpl@google.com>
Date: Tue, 4 Jul 2017 11:37:27 +0000 (+0000)
Subject: Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" am: 10c314e19a
X-Git-Tag: android-x86-9.0-r1~1029^2^2~138
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bdcebe39e6;p=android-x86%2Fframeworks-base.git

Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" am: 10c314e19a
am: d3f26b6731

Change-Id: I9d7be7013b1d70c5f3b1fef0399236c105f4196f
---

bdcebe39e686dd8a8b3fba94e0c4ea33eae44714