Merge "BackupManagerService files need new security labeling."

author Geremy Condra <gcondra@google.com>

Tue, 26 Mar 2013 05:10:37 +0000 (05:10 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Tue, 26 Mar 2013 05:10:38 +0000 (05:10 +0000)
author Geremy Condra <gcondra@google.com>
Tue, 26 Mar 2013 05:10:37 +0000 (05:10 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 26 Mar 2013 05:10:38 +0000 (05:10 +0000)
diff --cc services/java/com/android/server/BackupManagerService.java
Simple merge
author	Geremy Condra <gcondra@google.com>
	Tue, 26 Mar 2013 05:10:37 +0000 (05:10 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 26 Mar 2013 05:10:38 +0000 (05:10 +0000)