resolved conflicts for merge of ee25fc06 to dalvik-dev

author Carl Shapiro <cshapiro@google.com>

Tue, 20 Apr 2010 22:48:46 +0000 (15:48 -0700)

committer Carl Shapiro <cshapiro@google.com>

Tue, 20 Apr 2010 22:48:46 +0000 (15:48 -0700)
author Carl Shapiro <cshapiro@google.com>
Tue, 20 Apr 2010 22:48:46 +0000 (15:48 -0700)
committer Carl Shapiro <cshapiro@google.com>
Tue, 20 Apr 2010 22:48:46 +0000 (15:48 -0700)
diff --cc vm/Globals.h
Simple merge
diff --cc vm/Init.c
Simple merge
diff --cc vm/Sync.c
Simple merge
author	Carl Shapiro <cshapiro@google.com>
	Tue, 20 Apr 2010 22:48:46 +0000 (15:48 -0700)
committer	Carl Shapiro <cshapiro@google.com>
	Tue, 20 Apr 2010 22:48:46 +0000 (15:48 -0700)
		1	2
vm/Globals.h	patch \|	diff1 \|	diff2 \|	blob \| history
vm/Init.c	patch \|	diff1 \|	diff2 \|	blob \| history
vm/Sync.c	patch \|	diff1 \|	diff2 \|	blob \| history