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:
6fef520
19bb6c3
)
Merge "Tear down agent after preflight rejection" into oc-dr1-dev am: 47303ec66b
author
Christopher Tate
<ctate@google.com>
Thu, 13 Jul 2017 20:05:40 +0000
(20:05 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 13 Jul 2017 20:05:40 +0000
(20:05 +0000)
am:
19bb6c35ca
Change-Id: I17cbc0a91b65d755965ac4479d7656a7dbeef109
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