OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
76631a1
1fa3fd3
)
Clean up when recycling a pid with a pending launch am: d86e14e45c am: 92de60bd7f
author
Amith Yamasani
<yamasani@google.com>
Thu, 11 Aug 2016 22:02:53 +0000
(22:02 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 11 Aug 2016 22:02:53 +0000
(22:02 +0000)
am:
1fa3fd30bd
Change-Id: Ib4e36dc0be9c6a73907bbdf7f146a20e0d2eeb3f
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/BroadcastQueue.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc
services/core/java/com/android/server/am/BroadcastQueue.java
Simple merge