Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" am: 777c408a22

am: 6b0e6946c3 Change-Id: Ia6ceafa40c73589d516ca0d50168ba217b6af2c8
2017-07-18 23:43:46 +00:00
parent c3cc786404 6b0e6946c3
commit dbc78509ae
4 changed files with 3 additions and 1 deletions
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -421,7 +421,6 @@ public final class NetworkCapabilities implements Parcelable {

    /**
     * Indicates this network uses a LoWPAN transport.
-     * @hide
     */
    public static final int TRANSPORT_LOWPAN = 6;