summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-06-18 19:04:56 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-06-18 19:04:56 -0700
commit4910dc62561c90c75d953a04f75b31f16e0c0e9c (patch)
tree4244157c729b78b8900cf455a2f274905fa317e2 /include
parent0388b513418f0e1eb45bcb554f866e160cd475da (diff)
parentc62834b9faafdccc56439bdb62a63ffcdfbcb4c4 (diff)
downloadframeworks_native-4910dc62561c90c75d953a04f75b31f16e0c0e9c.zip
frameworks_native-4910dc62561c90c75d953a04f75b31f16e0c0e9c.tar.gz
frameworks_native-4910dc62561c90c75d953a04f75b31f16e0c0e9c.tar.bz2
am 5502f04c: Merge change 4709 into donut
Merge commit '5502f04c1dcf2b1918858bacb99fb0480a711707' * commit '5502f04c1dcf2b1918858bacb99fb0480a711707': backup stuff
Diffstat (limited to 'include')
-rw-r--r--include/utils/BackupHelpers.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/utils/BackupHelpers.h b/include/utils/BackupHelpers.h
index fc701fd..c78b99a 100644
--- a/include/utils/BackupHelpers.h
+++ b/include/utils/BackupHelpers.h
@@ -116,6 +116,7 @@ private:
int type;
entity_header_v1 entity;
} m_header;
+ String8 m_key;
};
int back_up_files(int oldSnapshotFD, BackupDataWriter* dataStream, int newSnapshotFD,