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:
d143bb6
d5cba89
)
Merge "ActivityManager: Add support for agents on startup"
author
Andreas Gampe
<agampe@google.com>
Thu, 25 Jan 2018 21:50:42 +0000
(21:50 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 25 Jan 2018 21:50:42 +0000
(21:50 +0000)
am:
d5cba89b98
Change-Id: Iee82ac1a08183857ea4fcf2d67b99dede5d5a2ae
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge