| commit | d939c9671200b4bef4cb231c3a95bceea46d6e63 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Tue Aug 11 23:44:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 11 23:44:46 2015 +0000 |
| tree | 07a7b52a5a1c07c07c624e91d1b8e7bd0f992667 | |
| parent | e14f71efd4dfef794fb347363cd0a700d3a6220e [diff] | |
| parent | df1bc67019f4eda8acfd4b97d4c4fd98b55edcb8 [diff] |
am df1bc670: resolved conflicts for merge of d213f5e7 to cw-e-dev * commit 'df1bc67019f4eda8acfd4b97d4c4fd98b55edcb8': dumpstate: add logcat -b all -S