OSDN Git Service

Merge "Correct scope of "disabled?" check viz backup/restore decisions" into oc-dev...
authorChris Tate <ctate@android.com>
Fri, 5 May 2017 01:27:53 +0000 (01:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 May 2017 01:27:53 +0000 (01:27 +0000)
commitaf31dffcb3fe884c4ee376f0e9503262abb80859
tree896ab9d4044e141757fa105d8753be536e4ca08a
parente52323ea912d2c4d8736f34dad9fa654a7d3c2d4
parent136f841c5c2025faf884c9d0923532b6ae753dee
Merge "Correct scope of "disabled?" check viz backup/restore decisions" into oc-dev am: d239223cb0
am: 136f841c5c

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