commit 53cb11bcdc96f0b4f390be9d43da903718e93a3d
author Etan Cohen <etancohen@google.com> Sun Nov 06 03:21:54 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sun Nov 06 03:21:54 2016 +0000
tree c967bee098f928ef4b3ee3ddeefa4fa023d6c57b
parent 521f992ae8c5dd47b8139235ddd884a703880c4d
parent 3aa7f61ebaa7397b35b945f6c987cb19034ff550

Merge "[NAN-AWARE] Rename NAN to Aware" am: ab180e53b9
am: 3aa7f61eba

Change-Id: I28cc8ef7a2589683fb16b9498ae1c2abfe2bf925

data/etc/android.hardware.wifi.aware.xml

diff --git a/data/etc/android.hardware.wifi.nan.xml b/data/etc/android.hardware.wifi.aware.xml
similarity index 90%
rename from data/etc/android.hardware.wifi.nan.xml
rename to data/etc/android.hardware.wifi.aware.xml
index e557610..ae6272e 100644
--- a/data/etc/android.hardware.wifi.nan.xml
+++ b/data/etc/android.hardware.wifi.aware.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- This is the standard feature indicating that the device includes WiFi NAN. -->
+<!-- This is the standard feature indicating that the device includes WiFi Aware. -->
 <permissions>
-    <feature name="android.hardware.wifi.nan" />
+    <feature name="android.hardware.wifi.aware" />
 </permissions>