OSDN Git Service

Merge "Offer to wait until broadcasts have drained." into oc-dev
authorJeff Sharkey <jsharkey@google.com>
Sat, 6 May 2017 01:58:07 +0000 (01:58 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 6 May 2017 01:58:12 +0000 (01:58 +0000)
commit6f4aab2c01280fc563fb1535621c0d0d7cb34221
tree4bd66e055dd0f15edbd4f9c93f3cec37982f08a0
parent748405a0f5030479819bed3480f8766dd2471271
parentfd65813157e4dd7fa9f0b7c5dd4c8f536cc6316a
Merge "Offer to wait until broadcasts have drained." into oc-dev
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/BroadcastQueue.java