merge from open-source master

author The Android Open Source Project <initial-contribution@android.com>

Fri, 4 Jun 2010 21:01:00 +0000 (14:01 -0700)

committer The Android Open Source Project <initial-contribution@android.com>

Fri, 4 Jun 2010 21:01:00 +0000 (14:01 -0700)
author The Android Open Source Project <initial-contribution@android.com>
Fri, 4 Jun 2010 21:01:00 +0000 (14:01 -0700)
committer The Android Open Source Project <initial-contribution@android.com>
Fri, 4 Jun 2010 21:01:00 +0000 (14:01 -0700)
diff --cc vm/mterp/out/InterpAsm-armv5te-vfp.S
Simple merge
diff --cc vm/mterp/out/InterpAsm-armv5te.S
Simple merge
diff --cc vm/mterp/out/InterpAsm-armv7-a.S
Simple merge
author	The Android Open Source Project <initial-contribution@android.com>
	Fri, 4 Jun 2010 21:01:00 +0000 (14:01 -0700)
committer	The Android Open Source Project <initial-contribution@android.com>
	Fri, 4 Jun 2010 21:01:00 +0000 (14:01 -0700)
		1	2
vm/mterp/out/InterpAsm-armv5te-vfp.S	patch \|	diff1 \|	diff2 \|	blob \| history
vm/mterp/out/InterpAsm-armv5te.S	patch \|	diff1 \|	diff2 \|	blob \| history
vm/mterp/out/InterpAsm-armv7-a.S	patch \|	diff1 \|	diff2 \|	blob \| history