Merge "Support traceview-style profiling in all builds" into dalvik-dev

author buzbee <buzbee@google.com>

Thu, 20 Jan 2011 17:22:08 +0000 (09:22 -0800)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 20 Jan 2011 17:22:08 +0000 (09:22 -0800)
author buzbee <buzbee@google.com>
Thu, 20 Jan 2011 17:22:08 +0000 (09:22 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 20 Jan 2011 17:22:08 +0000 (09:22 -0800)
diff --cc vm/Globals.h
Simple merge
diff --cc vm/Init.c
Simple merge
author	buzbee <buzbee@google.com>
	Thu, 20 Jan 2011 17:22:08 +0000 (09:22 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 20 Jan 2011 17:22:08 +0000 (09:22 -0800)
		1	2
vm/Globals.h	patch \|	diff1 \|	diff2 \|	blob \| history
vm/Init.c	patch \|	diff1 \|	diff2 \|	blob \| history