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:
b2a0009
520b283
)
Merge "AM: refactor LockTask whitelist update logic."
author
Charles He
<qiurui@google.com>
Mon, 18 Sep 2017 16:13:55 +0000
(16:13 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Mon, 18 Sep 2017 16:13:55 +0000
(16:13 +0000)
1
2
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
services/core/java/com/android/server/am/TaskRecord.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/am/ActivityStackSupervisor.java
Simple merge
diff --cc
services/core/java/com/android/server/am/TaskRecord.java
Simple merge
OSDN Git Service
