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

Change-Id: Iaea0fdd483b4d0988df442f9b291b99943009829

diff --cc cmds/dumpstate/dumpstate.c
index 58e2dc6,ef8db06..0aa8fe9
--- 1/cmds/dumpstate/dumpstate.c
--- 2/cmds/dumpstate/dumpstate.c
+++ b/cmds/dumpstate/dumpstate.c
@@@ -349,8 -348,8 +349,10 @@@ 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 */
      if (dump_traces_path != NULL) {
          dump_file("VM TRACES JUST NOW", dump_traces_path);