Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13

am: 877ccf68fb Change-Id: I6f894d92451032657678639c3021eef07289a6a2
2017-01-11 23:17:19 +00:00
parent 57c7fc11bd 877ccf68fb
commit 463d3c6e7c
1 changed files with 0 additions and 2 deletions
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -420,8 +420,6 @@ public final class NetworkCapabilities implements Parcelable {

    /**
     * Indicates this network uses a Wi-Fi Aware transport.
-     *
-     * @hide PROPOSED_AWARE_API
     */
    public static final int TRANSPORT_WIFI_AWARE = 5;