OSDN Git Service

Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev...
authorMichal Karpinski <mkarpinski@google.com>
Tue, 27 Jun 2017 21:02:57 +0000 (21:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Jun 2017 21:02:57 +0000 (21:02 +0000)
commit21d156c3104f00b32d1791738416a133179d967f
tree443a15c816580ecfc01fad420b6096c21cb236b5
parent12062d493792ec59d0afa937d3c45fbbf6a0f913
parent2ceefbf767d4eb338804545b2ca4300051197784
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev am: 0d1b1a253a am: 4b48d48a19
am: 2ceefbf767

Change-Id: I1cef46b35a89fd91dce268089757fc2edcccbff4
services/backup/java/com/android/server/backup/BackupManagerService.java