OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 15 Jun 2010 18:44:09 +0000 (11:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 15 Jun 2010 18:44:09 +0000 (11:44 -0700)
commit3ff1a5928f2d5bdd911ac59f8064ba35114dc2ec
treec8a86876a46a95c4e88fc46f1ed0e53f634f028f
parent7d10df4e2402c55dc827cb6675a15957071c00af
parent879becf57040d3785028eb34974cf93b0d85e861
merge from open-source master

Change-Id: Ib9ec3f3b7418d064b643577156d7d16688b3048d
services/java/com/android/server/KeyInputQueue.java
services/java/com/android/server/WindowManagerService.java