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:
7c33a5d
225d1b6
)
Merge "Clear deferRelaunchUntilPaused flag after activity relaunch is performed"...
author
Chong Zhang
<chz@google.com>
Thu, 31 Mar 2016 21:38:51 +0000
(21:38 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 31 Mar 2016 21:38:52 +0000
(21:38 +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