summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Brian Carlstrom <bdc@google.com> 2014-08-22 17:03:48 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-08-22 17:03:49 +0000
commit9a434ae00f065f038b33aed586e50f68fae501e3 (patch)
treeef72ed5295dc84c8e9b8e130d6296e12e944d19f
parent2180d3940721bbf8244ed2944e0cfdc64b77153c (diff)
parent8def5cbb3a1a68bb66fbe7ce63fcc8eadcbb238d (diff)
Merge "Move SystemBackupAgent from services.jar to frameworks.jar" into lmp-dev
-rw-r--r--core/java/com/android/server/backup/SystemBackupAgent.java (renamed from services/backup/java/com/android/server/backup/SystemBackupAgent.java)0
1 files changed, 0 insertions, 0 deletions
diff --git a/services/backup/java/com/android/server/backup/SystemBackupAgent.java b/core/java/com/android/server/backup/SystemBackupAgent.java
index 26e2e2ac356c..26e2e2ac356c 100644
--- a/services/backup/java/com/android/server/backup/SystemBackupAgent.java
+++ b/core/java/com/android/server/backup/SystemBackupAgent.java