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:
72287ab
8305a1f
)
Merge "Fix issue #37306208: CTS: ServiceTest#testForegroundService..." into oc-dev
author
Dianne Hackborn
<hackbod@google.com>
Wed, 19 Apr 2017 22:29:59 +0000
(22:29 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 19 Apr 2017 22:29:59 +0000
(22:29 +0000)
am:
8305a1fb38
Change-Id: I57e7e983ff3492fe3a6cf3560eded4122a7bd736
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
OSDN Git Service
