Merge "Move most zygote related code to frameworks/base."

author Narayan Kamath <narayan@google.com>

Wed, 2 Apr 2014 10:29:49 +0000 (10:29 +0000)

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

Wed, 2 Apr 2014 10:29:50 +0000 (10:29 +0000)
author Narayan Kamath <narayan@google.com>
Wed, 2 Apr 2014 10:29:49 +0000 (10:29 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 2 Apr 2014 10:29:50 +0000 (10:29 +0000)
diff --cc runtime/Android.mk
Simple merge
diff --cc runtime/runtime.cc
Simple merge
author	Narayan Kamath <narayan@google.com>
	Wed, 2 Apr 2014 10:29:49 +0000 (10:29 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 2 Apr 2014 10:29:50 +0000 (10:29 +0000)
		1	2
runtime/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/runtime.cc	patch \|	diff1 \|	diff2 \|	blob \| history