OSDN Git Service

Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission...
authorBilly Lau <billylau@google.com>
Tue, 14 Jul 2015 18:22:29 +0000 (18:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 14 Jul 2015 18:22:30 +0000 (18:22 +0000)
commit52df60d83dc48818aacbe1721e6aaa9be39e8451
tree8a5ad4f8dc7a9fe66fd13b7964c35966d5d5d984
parent8505d4a51d1112ea71f7df680cf85378a9567bde
parent7f70ba18e6760c2539704c16cf3865bf49953d50
Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev
AndroidManifest.xml
res/values/strings.xml
src/com/android/settings/applications/ManageApplications.java