Merge changes Id931d441,I83faf974

author Narayan Kamath <narayan@google.com>

Thu, 14 Sep 2017 23:57:14 +0000 (23:57 +0000)

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

Thu, 14 Sep 2017 23:57:14 +0000 (23:57 +0000)
author Narayan Kamath <narayan@google.com>
Thu, 14 Sep 2017 23:57:14 +0000 (23:57 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 23:57:14 +0000 (23:57 +0000)
diff --cc core/java/com/android/internal/os/Zygote.java
Simple merge
diff --cc core/java/com/android/internal/os/ZygoteInit.java
Simple merge
author	Narayan Kamath <narayan@google.com>
	Thu, 14 Sep 2017 23:57:14 +0000 (23:57 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 14 Sep 2017 23:57:14 +0000 (23:57 +0000)
		1	2
core/java/com/android/internal/os/Zygote.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/com/android/internal/os/ZygoteInit.java	patch \|	diff1 \|	diff2 \|	blob \| history