OSDN Git Service

Merge "Annotate @SystemApi with required permissions." into oc-dev
authorJeff Sharkey <jsharkey@google.com>
Mon, 5 Jun 2017 22:28:21 +0000 (22:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 5 Jun 2017 22:28:21 +0000 (22:28 +0000)
commit7a2e4a848602ddb861f9f35cb93edbdca32a7db1
tree99962917a2afd3320cb77a3cdb12d5b96bd4293d
parentc382355cc1ab65017e74d7e0d43efe791ca741cd
parentc1406978a4be2d7462142f6c3b3fcdfaca50ec67
Merge "Annotate @SystemApi with required permissions." into oc-dev
am: c1406978a4

Change-Id: I305967cad945a807c3f8234efabaad0ef8b591d1
core/java/android/content/Context.java
core/java/android/hardware/radio/RadioManager.java
core/java/android/net/ConnectivityManager.java
core/java/android/net/IpSecManager.java
core/java/android/net/nsd/NsdManager.java
core/java/android/os/RecoverySystem.java
telephony/java/android/telephony/CarrierConfigManager.java
telephony/java/android/telephony/TelephonyManager.java
wifi/java/android/net/wifi/aware/WifiAwareManager.java