OSDN Git Service

DO NOT MERGE Manually merge commit 'f28778064383821ccf48c9570191f34a24aa513f' into...
authorMitchell Wills <mwills@google.com>
Tue, 30 Aug 2016 00:45:00 +0000 (17:45 -0700)
committerMitchell Wills <mwills@google.com>
Tue, 30 Aug 2016 00:46:44 +0000 (17:46 -0700)
commit722de5f9d0bbac21fb0d132669fcc317e2c6703f
treec8ddb4aeecd9192dd06964a1aa5d3704cebcf500
parenta6a95328dded479e5ec34ed4f8d356c0b1cebe41
parentf28778064383821ccf48c9570191f34a24aa513f
DO NOT MERGE Manually merge commit 'f28778064383821ccf48c9570191f34a24aa513f' into nyc-mr1-dev-plus-aosp

Change-Id: I7cb1f97a5b931c2057a811d7947f47ad7320ef1c
Android.mk
core/java/android/content/Context.java
core/java/android/content/pm/PackageManager.java
core/java/android/os/INetworkManagementService.aidl
core/res/AndroidManifest.xml
core/res/res/values/config.xml
core/res/res/values/symbols.xml
services/core/java/com/android/server/NetworkManagementService.java
wifi/java/android/net/wifi/WifiManager.java