am f734811d: am 84a9ba10: Merge "Fix testing wrong variable for non zygote." into...

author Mathieu Chartier <mathieuc@google.com>

Fri, 22 Aug 2014 17:12:13 +0000 (17:12 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Fri, 22 Aug 2014 17:12:13 +0000 (17:12 +0000)
author Mathieu Chartier <mathieuc@google.com>
Fri, 22 Aug 2014 17:12:13 +0000 (17:12 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 22 Aug 2014 17:12:13 +0000 (17:12 +0000)
diff --cc runtime/gc/heap.cc
Simple merge
diff --cc runtime/parsed_options.cc
Simple merge
author	Mathieu Chartier <mathieuc@google.com>
	Fri, 22 Aug 2014 17:12:13 +0000 (17:12 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 22 Aug 2014 17:12:13 +0000 (17:12 +0000)
		1	2
runtime/gc/heap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/parsed_options.cc	patch \|	diff1 \|	diff2 \|	blob \| history