OSDN Git Service

Merge "Unify inputDispatchingTimedOut with keyDispatchingTimedOut" into jb-mr2-dev
authorMichael Wright <michaelwr@google.com>
Fri, 1 Mar 2013 22:20:46 +0000 (22:20 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 1 Mar 2013 22:20:46 +0000 (22:20 +0000)
commit32440aa25d958c8b82e7c17f784defc0a5860c0a
treeff9b2f209fb7e51073fea1b3f6a4b97e3599b41c
parent7be6d4c421cfa6f93079517d3ee54024c8049ae5
parent7dd5bb18d44a9ed0521308595f664b51b6e9b3e9
Merge "Unify inputDispatchingTimedOut with keyDispatchingTimedOut" into jb-mr2-dev
services/java/com/android/server/am/ActivityManagerService.java
services/java/com/android/server/am/ActivityRecord.java