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:
da067dc
f8451b9
)
Merge "Kill foreground apps when turning off work" into nyc-dev
author
Rubin Xu
<rubinxu@google.com>
Wed, 20 Apr 2016 09:33:51 +0000
(09:33 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 20 Apr 2016 09:33:52 +0000
(09:33 +0000)
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/pm/UserManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc
services/core/java/com/android/server/pm/UserManagerService.java
Simple merge