From: Billy Lau <billylau@google.com>
Date: Tue, 14 Jul 2015 18:22:29 +0000 (+0000)
Subject: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission... 
X-Git-Tag: android-x86-6.0-r1~25^2~137
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=52df60d8;p=android-x86%2Fpackages-apps-Settings.git

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
---

52df60d83dc48818aacbe1721e6aaa9be39e8451