merge from open-source master

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

Tue, 15 Jun 2010 18:44:09 +0000 (11:44 -0700)

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

Tue, 15 Jun 2010 18:44:09 +0000 (11:44 -0700)
author The Android Open Source Project <initial-contribution@android.com>
Tue, 15 Jun 2010 18:44:09 +0000 (11:44 -0700)
committer The Android Open Source Project <initial-contribution@android.com>
Tue, 15 Jun 2010 18:44:09 +0000 (11:44 -0700)
diff --cc services/java/com/android/server/KeyInputQueue.java
Simple merge
diff --cc services/java/com/android/server/WindowManagerService.java
Simple merge
author	The Android Open Source Project <initial-contribution@android.com>
	Tue, 15 Jun 2010 18:44:09 +0000 (11:44 -0700)
committer	The Android Open Source Project <initial-contribution@android.com>
	Tue, 15 Jun 2010 18:44:09 +0000 (11:44 -0700)
		1	2
services/java/com/android/server/KeyInputQueue.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/java/com/android/server/WindowManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history