Merge "Enables the use of the blastula pool."

author Christian Wailes <chriswailes@google.com>

Fri, 25 Jan 2019 02:06:47 +0000 (02:06 +0000)

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

Fri, 25 Jan 2019 02:06:47 +0000 (02:06 +0000)
author Christian Wailes <chriswailes@google.com>
Fri, 25 Jan 2019 02:06:47 +0000 (02:06 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 25 Jan 2019 02:06:47 +0000 (02:06 +0000)
diff --cc core/jni/com_android_internal_os_Zygote.cpp
Simple merge
author	Christian Wailes <chriswailes@google.com>
	Fri, 25 Jan 2019 02:06:47 +0000 (02:06 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Fri, 25 Jan 2019 02:06:47 +0000 (02:06 +0000)