commit 43263228e85bb1db6423eb593b4b3d8e11d84e39
author David Anderson <dvander@google.com> Tue Dec 17 17:26:28 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 17 17:26:28 2024 -0800
tree 8c8a9795b9383160a07eb244f11131d1468cbb4e
parent 7eda62fff98acadc9893f357bdfdfcdb2d72760f
parent 08afd2159bddb1ab2a99143c56376bb81fea1a98

Merge "vts_libsnapshot_test: Address flake in scratch metadata test." into main

debuggerd/libdebuggerd/tombstone_proto_to_text.cpp

diff --git a/debuggerd/libdebuggerd/tombstone_proto_to_text.cpp b/debuggerd/libdebuggerd/tombstone_proto_to_text.cpp
index 0474ae7..11841b2 100644
--- a/debuggerd/libdebuggerd/tombstone_proto_to_text.cpp
+++ b/debuggerd/libdebuggerd/tombstone_proto_to_text.cpp
@@ -594,7 +594,7 @@
   if (tombstone.page_size() != 4096) {
     CBL("Page size: %d bytes", tombstone.page_size());
   } else if (tombstone.has_been_16kb_mode()) {
-    CBL("Has been in 16kb mode: yes");
+    CBL("Has been in 16 KB mode before: yes");
   }
 
   // Process header

fs_mgr/TEST_MAPPING

diff --git a/fs_mgr/TEST_MAPPING b/fs_mgr/TEST_MAPPING
index 13af1e2..ccbb67e 100644
--- a/fs_mgr/TEST_MAPPING
+++ b/fs_mgr/TEST_MAPPING
@@ -36,9 +36,6 @@
   ],
   "kernel-presubmit": [
     {
-      "name": "adb-remount-sh"
-    },
-    {
       "name": "libdm_test"
     },
     {