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:
3a3fb73
35c2827
)
Merge "Ensure that the stream feeder doesn't hang in write..." into nyc-dev
author
Chris Tate
<ctate@android.com>
Thu, 5 May 2016 19:35:37 +0000
(19:35 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 5 May 2016 19:35:39 +0000
(19:35 +0000)
1
2
services/backup/java/com/android/server/backup/BackupManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/backup/java/com/android/server/backup/BackupManagerService.java
Simple merge