am 9adfbce7: am d939c967: am df1bc670: resolved conflicts for merge of d213f5e7 to cw-e-dev

* commit '9adfbce773ce84ca21ef88664f2b23ac7e32ee45':
  dumpstate: add logcat -b all -S