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:
2cea154
bccd4b5
)
Merge "Fix deadlock when fetching active voice interaction service component."
author
TreeHugger Robot
<treehugger-gerrit@google.com>
Wed, 13 Dec 2017 21:38:14 +0000
(21:38 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 13 Dec 2017 21:38:14 +0000
(21:38 +0000)
1
2
core/java/android/app/ActivityManagerInternal.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/app/ActivityManagerInternal.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge