OSDN Git Service

Merge "[NAN-AWARE] Rename NAN to Aware"
authorEtan Cohen <etancohen@google.com>
Sun, 6 Nov 2016 03:13:31 +0000 (03:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 6 Nov 2016 03:13:31 +0000 (03:13 +0000)
commit65710071018141fecd0346ed09e53c262939e54c
tree2721d6b5a3232d0a67d2aaa2edcae18c6444ed80
parente81eb613996c5f8e0564137bd6bbe759ea218d45
parent74b1131cc820f817ece95eef2aa96f7181acdd95
Merge "[NAN-AWARE] Rename NAN to Aware"
am: 74b1131cc8

Change-Id: I2e788e19a11f2709f2e542dbdc4b58433a3574bf
Android.mk
core/java/android/content/Context.java
core/java/android/content/pm/PackageManager.java
core/java/android/net/NetworkCapabilities.java
core/res/AndroidManifest.xml
services/java/com/android/server/SystemServer.java
wifi/java/android/net/wifi/WifiManager.java