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

am: 2635c03fda Change-Id: Ib668ed15ccf1f05c5ed31f700b69e1f3ab8b4cac
2017-01-11 23:28:20 +00:00
parent 8ecbfcb60c 2635c03fda
commit 89cec191a8
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;