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:
2517794
5513302
)
Merge "Fix regression in assist data fetching and canceling" into pi-dev
author
Winson Chung
<winsonc@google.com>
Wed, 18 Apr 2018 20:07:06 +0000
(13:07 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 18 Apr 2018 20:07:06 +0000
(13:07 -0700)
am:
5513302b43
Change-Id: I7c4e6bf2b66455f39ffff95f49dbffcf2b289b74
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