Merge "Special handling of priv-apps in Zygote."

author Nicolas Geoffray <ngeoffray@google.com>

Tue, 19 Sep 2017 11:56:05 +0000 (11:56 +0000)

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

Tue, 19 Sep 2017 11:56:05 +0000 (11:56 +0000)
author Nicolas Geoffray <ngeoffray@google.com>
Tue, 19 Sep 2017 11:56:05 +0000 (11:56 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 19 Sep 2017 11:56:05 +0000 (11:56 +0000)
diff --cc core/java/com/android/internal/os/Zygote.java
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Nicolas Geoffray <ngeoffray@google.com>
	Tue, 19 Sep 2017 11:56:05 +0000 (11:56 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 19 Sep 2017 11:56:05 +0000 (11:56 +0000)
		1	2
core/java/com/android/internal/os/Zygote.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history