Merge "Expose removed permissions flag as system API" into nyc-dev

author Svetoslav Ganov <svetoslavganov@google.com>

Tue, 23 Feb 2016 02:21:00 +0000 (02:21 +0000)

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

Tue, 23 Feb 2016 02:21:01 +0000 (02:21 +0000)
author Svetoslav Ganov <svetoslavganov@google.com>
Tue, 23 Feb 2016 02:21:00 +0000 (02:21 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 23 Feb 2016 02:21:01 +0000 (02:21 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc core/res/res/values/attrs_manifest.xml
Simple merge
diff --cc services/core/java/com/android/server/pm/Settings.java
Simple merge
author	Svetoslav Ganov <svetoslavganov@google.com>
	Tue, 23 Feb 2016 02:21:00 +0000 (02:21 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 23 Feb 2016 02:21:01 +0000 (02:21 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/attrs_manifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history