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:
12062d4
2ceefbf
)
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev...
author
Michal Karpinski
<mkarpinski@google.com>
Tue, 27 Jun 2017 21:02:57 +0000
(21:02 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 27 Jun 2017 21:02:57 +0000
(21:02 +0000)
am:
2ceefbf767
Change-Id: I1cef46b35a89fd91dce268089757fc2edcccbff4
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