diff --git a/tests/src/com/android/launcher3/util/rule/SamplerRule.java b/tests/src/com/android/launcher3/util/rule/SamplerRule.java
index 6125f2a8d2..503d654316 100644
--- a/tests/src/com/android/launcher3/util/rule/SamplerRule.java
+++ b/tests/src/com/android/launcher3/util/rule/SamplerRule.java
@@ -30,6 +30,7 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Map;
 
 /**
  * A rule that generates a file that helps diagnosing cases when the test process was terminated
@@ -85,13 +86,17 @@ public class SamplerRule implements TestRule {
                         int count = 0;
                         while (true) {
                             writer.write(
-                                    "#"
-                                            + (count++)
-                                            + " =============================================\r\n");
-                            for (StackTraceElement[] stack : getAllStackTraces().values()) {
-                                writer.write("---------------------\r\n");
-                                for (StackTraceElement frame : stack) {
-                                    writer.write(frame.toString() + "\r\n");
+                                    "Slice # "
+                                    + (count++)
+                                    + " @ "
+                                    + new SimpleDateFormat("HH:mm:ss.SSS").format(new Date())
+                                            + "\r\n");
+                            for (Map.Entry<Thread, StackTraceElement[]> entry :
+                                     getAllStackTraces().entrySet()) {
+                                writer.write("  Thread \"" + entry.getKey().getName()
+                                                 + "\"\r\n");
+                                for (StackTraceElement frame : entry.getValue()) {
+                                    writer.write("    " + frame.toString() + "\r\n");
                                 }
                             }
                             writer.flush();