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:
7acf27c
f1a4b50
)
Merge "Work on issue #36891897: Need to ensure foreground services can't..." into...
author
Dianne Hackborn
<hackbod@google.com>
Sun, 30 Apr 2017 17:34:21 +0000
(17:34 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Sun, 30 Apr 2017 17:34:21 +0000
(17:34 +0000)
am:
f1a4b50739
Change-Id: I242303b9dc50a8a69525d26a41cec6c09e361d17
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