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:
80e455e
047dfd4
)
Merge "[ActivityManager] Finish the failed-to-pause activity"
author
Olawale Ogunwale
<ogunwale@google.com>
Wed, 8 Apr 2015 12:51:11 +0000
(12:51 +0000)
committer
Gerrit Code Review
<noreply-gerritcodereview@google.com>
Wed, 8 Apr 2015 12:51:12 +0000
(12:51 +0000)
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