am 45b27c3a
: (-s ours) 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 '45b27c3a04b997362d0884d2e52aa54d8fff1319':
This commit is contained in: