OSDN Git Service

am 52df60d8: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS...
authorBilly Lau <billylau@google.com>
Tue, 14 Jul 2015 18:36:53 +0000 (18:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 18:36:53 +0000 (18:36 +0000)
commitde784e6ab5e86eb780cdeee4a2f01e2db9a1ef07
tree2d9d4755d524776fa7566525ca80af38d5966cb5
parent464e54f88b4aa933a7d26cb1afecf0ddfc282751
parent52df60d83dc48818aacbe1721e6aaa9be39e8451
am 52df60d8: 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

* commit '52df60d83dc48818aacbe1721e6aaa9be39e8451':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
AndroidManifest.xml