summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Etan Cohen <etancohen@google.com> 2016-11-06 03:13:51 +0000
committer android-build-merger <android-build-merger@google.com> 2016-11-06 03:13:51 +0000
commit3aa7f61ebaa7397b35b945f6c987cb19034ff550 (patch)
tree76ac1b1c636a1bff5d0e0b79b4b6ae6ae0d1477d
parent564e686168eded2b9c57420a32cf740cc1ad8eba (diff)
parentab180e53b9a4dcae5f966584d5aa5021093aee66 (diff)
Merge "[NAN-AWARE] Rename NAN to Aware"
am: ab180e53b9 Change-Id: I75b3722f37d606e42effc9dee731210df958c7bd
-rw-r--r--data/etc/android.hardware.wifi.aware.xml (renamed from data/etc/android.hardware.wifi.nan.xml)4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/etc/android.hardware.wifi.nan.xml b/data/etc/android.hardware.wifi.aware.xml
index e557610c98..ae6272ed2c 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>