Merge "Allow changing signing cert for system apps that use shared users"

author Bryan Henry <bryanhenry@google.com>

Fri, 25 May 2018 20:21:23 +0000 (20:21 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Fri, 25 May 2018 20:21:23 +0000 (20:21 +0000)
author Bryan Henry <bryanhenry@google.com>
Fri, 25 May 2018 20:21:23 +0000 (20:21 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 25 May 2018 20:21:23 +0000 (20:21 +0000)
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Bryan Henry <bryanhenry@google.com>
	Fri, 25 May 2018 20:21:23 +0000 (20:21 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Fri, 25 May 2018 20:21:23 +0000 (20:21 +0000)