merge from open-source master

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

Wed, 12 May 2010 16:27:49 +0000 (09:27 -0700)

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

Wed, 12 May 2010 16:27:49 +0000 (09:27 -0700)
author The Android Open Source Project <initial-contribution@android.com>
Wed, 12 May 2010 16:27:49 +0000 (09:27 -0700)
committer The Android Open Source Project <initial-contribution@android.com>
Wed, 12 May 2010 16:27:49 +0000 (09:27 -0700)
diff --cc cmds/monkey/src/com/android/commands/monkey/Monkey.java
Simple merge
author	The Android Open Source Project <initial-contribution@android.com>
	Wed, 12 May 2010 16:27:49 +0000 (09:27 -0700)
committer	The Android Open Source Project <initial-contribution@android.com>
	Wed, 12 May 2010 16:27:49 +0000 (09:27 -0700)