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

* commit 'd939c9671200b4bef4cb231c3a95bceea46d6e63':
  dumpstate: add logcat -b all -S