OSDN Git Service

Merge "Offer to wait until broadcasts have drained." into oc-dev
authorJeff Sharkey <jsharkey@google.com>
Sat, 6 May 2017 02:08:27 +0000 (02:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 6 May 2017 02:08:27 +0000 (02:08 +0000)
commit8c921a8f14fadb9da17c2885b75a22a71f237cd2
tree4054f23f1d332b5676e5a94adefb62e96129d1cd
parentf9c94ddef7a50bd0d5cd26b6337b3fca9a53dad0
parent6f4aab2c01280fc563fb1535621c0d0d7cb34221
Merge "Offer to wait until broadcasts have drained." into oc-dev
am: 6f4aab2c01

Change-Id: Id6045353ed2293ece7ecdb7697904fa7993a7ed3
services/core/java/com/android/server/am/ActivityManagerService.java