Merge "Rewrite handling of oob priv-apps in framework."

author Nicolas Geoffray <ngeoffray@google.com>

Thu, 25 Jan 2018 08:59:28 +0000 (08:59 +0000)

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

Thu, 25 Jan 2018 08:59:28 +0000 (08:59 +0000)
author Nicolas Geoffray <ngeoffray@google.com>
Thu, 25 Jan 2018 08:59:28 +0000 (08:59 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 25 Jan 2018 08:59:28 +0000 (08:59 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc services/core/java/com/android/server/pm/PackageDexOptimizer.java
Simple merge
author	Nicolas Geoffray <ngeoffray@google.com>
	Thu, 25 Jan 2018 08:59:28 +0000 (08:59 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 25 Jan 2018 08:59:28 +0000 (08:59 +0000)
		1	2
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/PackageDexOptimizer.java	patch \|	diff1 \|	diff2 \|	blob \| history