Merge "Runtime::PreZygoteFork returns void, not boolean."

author Narayan Kamath <narayan@google.com>

Thu, 3 Apr 2014 12:28:17 +0000 (12:28 +0000)

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

Thu, 3 Apr 2014 12:28:17 +0000 (12:28 +0000)
author Narayan Kamath <narayan@google.com>
Thu, 3 Apr 2014 12:28:17 +0000 (12:28 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 3 Apr 2014 12:28:17 +0000 (12:28 +0000)
diff --cc runtime/runtime.cc
Simple merge
diff --cc runtime/runtime.h
Simple merge
author	Narayan Kamath <narayan@google.com>
	Thu, 3 Apr 2014 12:28:17 +0000 (12:28 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 3 Apr 2014 12:28:17 +0000 (12:28 +0000)
		1	2
runtime/runtime.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/runtime.h	patch \|	diff1 \|	diff2 \|	blob \| history