tree d49835b64f19171e7aaef7bf96dd78a210bc15c7
parent 3b2b9b6238a6bb6acecbf132a5843e0df8f721f4
parent d3f26b67312ccd5f0b1ecc43a0b2eed244285d07
author Roland Levillain <rpl@google.com> 1499168247 +0000
committer android-build-merger <android-build-merger@google.com> 1499168247 +0000

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

Change-Id: I9d7be7013b1d70c5f3b1fef0399236c105f4196f