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:
5b61a28
380415b
)
am 380415b6: am 1bdbce29: Merge "[ActivityManager] Finish the failed-to-pause activity"
author
Olawale Ogunwale
<ogunwale@google.com>
Wed, 8 Apr 2015 13:19:02 +0000
(13:19 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 8 Apr 2015 13:19:02 +0000
(13:19 +0000)
* commit '
380415b6431adeb8138bc328a926807b8ae41df9
':
[ActivityManager] Finish the failed-to-pause activity
Trivial merge