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:
585f7c1
04ab346
)
Merge "Allow at most one pinned stack task." into oc-dev
author
Bryce Lee
<brycelee@google.com>
Tue, 18 Apr 2017 21:30:58 +0000
(21:30 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 18 Apr 2017 21:31:04 +0000
(21:31 +0000)
1
2
services/core/java/com/android/server/am/ActivityStackSupervisor.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityStackSupervisor.java
Simple merge