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:
5545f02
5b65b13
)
Merge "Clear pending activity launches when force stop package" am: 00b678dd2d
author
liulvping
<liulvping@xiaomi.com>
Thu, 29 Sep 2016 19:54:25 +0000
(19:54 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 29 Sep 2016 19:54:25 +0000
(19:54 +0000)
am:
5b65b132b3
Change-Id: Ie5287b8e3c27ae48c513fed6111cab8914cac4dc
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityStarter.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/ActivityStarter.java
Simple merge
OSDN Git Service
