Manually merge commit '530b93aae428'

* commit '530b93aae428':
  NetworkCapabilities: Unhide TRANSPORT_LOWPAN

BUG:31038431
This commit is contained in:
The Android Automerger
2017-07-19 00:27:08 +00:00

View File

@@ -421,7 +421,6 @@ public final class NetworkCapabilities implements Parcelable {
/** /**
* Indicates this network uses a LoWPAN transport. * Indicates this network uses a LoWPAN transport.
* @hide
*/ */
public static final int TRANSPORT_LOWPAN = 6; public static final int TRANSPORT_LOWPAN = 6;