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:
801e7bb
e1fe7fa
)
Merge "Added TaskWindowContainerController"
author
TreeHugger Robot
<treehugger-gerrit@google.com>
Wed, 11 Jan 2017 19:14:52 +0000
(19:14 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 11 Jan 2017 19:14:55 +0000
(19:14 +0000)
1
2
packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityStackSupervisor.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityStackSupervisor.java
Simple merge