commit 23c8e1345cb108904b9012bca5b258c310cb2521
author Etan Cohen <etancohen@google.com> Sun Nov 06 03:29:53 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sun Nov 06 03:29:53 2016 +0000
tree 7157e01bdcd7c4f898b724f953b266ec8a5cd537
parent abffee11a82eebbb825c759067ea76f604a8dc7c
parent 53cb11bcdc96f0b4f390be9d43da903718e93a3d

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

Change-Id: Iec7bfcf8d55a6735d43630686dc2e4a8b4d8c895

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>