Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission...

author Billy Lau <billylau@google.com>

Tue, 14 Jul 2015 18:22:29 +0000 (18:22 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 14 Jul 2015 18:22:30 +0000 (18:22 +0000)
author Billy Lau <billylau@google.com>
Tue, 14 Jul 2015 18:22:29 +0000 (18:22 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 14 Jul 2015 18:22:30 +0000 (18:22 +0000)
diff --cc AndroidManifest.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/applications/ManageApplications.java
Simple merge
author	Billy Lau <billylau@google.com>
	Tue, 14 Jul 2015 18:22:29 +0000 (18:22 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 14 Jul 2015 18:22:30 +0000 (18:22 +0000)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/applications/ManageApplications.java	patch \|	diff1 \|	diff2 \|	blob \| history