Merge changes I845d2250,I4faa0785 am: 51b127c71e (7a5b3970) · Commits · e / os / android_system_core

fs_mgr/libsnapshot/android/snapshot/snapshot.proto

+2 −2

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ message SnapshotUpdateStatus {
		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 @@ message SnapshotMergeReport {
		int32 resume_count = 2;

		// Total size of all the COW images before the update.
		uint64 cow_file_size = 4;
		uint64 cow_file_size = 3;
		}