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:
cef9916
ff3efc2
)
am 053ce1e7: am 40185726: am a9c5257a: am a0bb44ef: Merge "Finish crashed activities...
author
Craig Mautner
<cmautner@google.com>
Fri, 25 Jul 2014 19:18:05 +0000
(19:18 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 25 Jul 2014 19:18:05 +0000
(19:18 +0000)
* commit '
053ce1e7a85e3ca7820a3b9e1b2c203d1a1a345b
':
Finish crashed activities immediately
1
2
services/core/java/com/android/server/am/ActivityStack.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityStack.java
Simple merge