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

am: 463d3c6e7c Change-Id: If2a6b632cd03984921572b190745865953a8e808
2017-01-11 23:22:51 +00:00
parent d3a305abc6 463d3c6e7c
commit 669e846a8a
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;