OSDN Git Service

resolve merge conflicts of 270947f to klp-modular-dev
authorSudheer Shanka <sudheersai@google.com>
Fri, 19 Aug 2016 18:27:31 +0000 (11:27 -0700)
committerSudheer Shanka <sudheersai@google.com>
Fri, 19 Aug 2016 18:37:22 +0000 (11:37 -0700)
commit76c4b2a7b66d6220265ca08a70b0f9baa543a7f0
tree6085446af02244f294655308277a2785d0a300d9
parent4cf5241f47a48e4d84ed4786e4346ea93ef089a4
parent270947f78c77a7f5138f1d297c5d95327b30834b
resolve merge conflicts of 270947f to klp-modular-dev

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