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:
3330585
2f28843
)
Merge "Fixed Content Capture workflow when service package is updated."
author
TreeHugger Robot
<treehugger-gerrit@google.com>
Fri, 22 Mar 2019 23:00:01 +0000
(23:00 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 22 Mar 2019 23:00:01 +0000
(23:00 +0000)
1
2
core/java/android/service/contentcapture/ContentCaptureService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/service/contentcapture/ContentCaptureService.java
Simple merge
diff --cc
services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java
Simple merge
diff --cc
services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java
Simple merge