resolved conflicts for merge of d213f5e7 to cw-e-dev

Change-Id: Iaea0fdd483b4d0988df442f9b291b99943009829
This commit is contained in:
Mark Salyzyn 2015-08-11 16:27:05 -07:00
commit df1bc67019

View File

@ -349,6 +349,8 @@ static void dumpstate() {
}
run_command("RADIO LOG", timeout / 1000, "logcat", "-b", "radio", "-v", "threadtime", "-d", "*:v", NULL);
run_command("LOG STATISTICS", 10, "logcat", "-b", "all", "-S", NULL);
run_command("RAFT LOGS", 300, SU_PATH, "root", "logcompressor", "-r", RAFT_DIR, NULL);
/* show the traces we collected in main(), if that was done */