Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev

author Svetoslav Ganov <svetoslavganov@google.com>

Thu, 29 Oct 2015 01:10:46 +0000 (01:10 +0000)

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

Thu, 29 Oct 2015 01:10:46 +0000 (01:10 +0000)
author Svetoslav Ganov <svetoslavganov@google.com>
Thu, 29 Oct 2015 01:10:46 +0000 (01:10 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 29 Oct 2015 01:10:46 +0000 (01:10 +0000)
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Svetoslav Ganov <svetoslavganov@google.com>
	Thu, 29 Oct 2015 01:10:46 +0000 (01:10 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 29 Oct 2015 01:10:46 +0000 (01:10 +0000)
		1	2
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/PackageManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history