| commit | 7a5b39709a705d1181baeb899f1287d50d5d1441 | [log] [tgz] |
|---|---|---|
| author | Yifan Hong <elsk@google.com> | Sat May 30 01:22:12 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 30 01:22:12 2020 +0000 |
| tree | 3e9720fe738cecc4a1ad85e6330abb7dd211e347 | |
| parent | c757b578f760233c4dfe6b470ae0a75724f8bfef [diff] | |
| parent | 51b127c71edcd265267a06c80fb68d87640f93dc [diff] |
Merge changes I845d2250,I4faa0785 am: 51b127c71e Change-Id: Id4e378b449cd7939ff156199e189490b1de3ff56
diff --git a/fs_mgr/libsnapshot/android/snapshot/snapshot.proto b/fs_mgr/libsnapshot/android/snapshot/snapshot.proto index 587089e..0328132 100644 --- a/fs_mgr/libsnapshot/android/snapshot/snapshot.proto +++ b/fs_mgr/libsnapshot/android/snapshot/snapshot.proto
@@ -132,7 +132,7 @@ uint64 metadata_sectors = 4; } -// Next: 2 +// Next: 4 message SnapshotMergeReport { // Status of the update after the merge attempts. UpdateState state = 1; @@ -142,5 +142,5 @@ int32 resume_count = 2; // Total size of all the COW images before the update. - uint64 cow_file_size = 4; + uint64 cow_file_size = 3; }