am 1585bd24: Merge change 4828 into donut

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

Fri, 19 Jun 2009 23:44:07 +0000 (16:44 -0700)

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

Fri, 19 Jun 2009 23:44:07 +0000 (16:44 -0700)
author Android (Google) Code Review <android-gerrit@google.com>
Fri, 19 Jun 2009 23:44:07 +0000 (16:44 -0700)
committer The Android Open Source Project <initial-contribution@android.com>
Fri, 19 Jun 2009 23:44:07 +0000 (16:44 -0700)
diff --cc Bundle.h
Simple merge
diff --cc Command.cpp
Simple merge
diff --cc Main.cpp
Simple merge
author	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 19 Jun 2009 23:44:07 +0000 (16:44 -0700)
committer	The Android Open Source Project <initial-contribution@android.com>
	Fri, 19 Jun 2009 23:44:07 +0000 (16:44 -0700)
		1	2
Bundle.h	patch \|	diff1 \|	diff2 \|	blob \| history
Command.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
Main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history