Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined...

author Atanas Kirilov <akirilov@google.com>

Sat, 29 Sep 2018 00:53:41 +0000 (17:53 -0700)

committer android-build-merger <android-build-merger@google.com>

Sat, 29 Sep 2018 00:53:41 +0000 (17:53 -0700)
author Atanas Kirilov <akirilov@google.com>
Sat, 29 Sep 2018 00:53:41 +0000 (17:53 -0700)
committer android-build-merger <android-build-merger@google.com>
Sat, 29 Sep 2018 00:53:41 +0000 (17:53 -0700)
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
diff --cc services/core/java/com/android/server/pm/Settings.java
Simple merge
author	Atanas Kirilov <akirilov@google.com>
	Sat, 29 Sep 2018 00:53:41 +0000 (17:53 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Sat, 29 Sep 2018 00:53:41 +0000 (17:53 -0700)
		1	2
services/core/java/com/android/server/pm/PackageManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history