tree 6ecb7eba7c6e5361b346fea090c30bb429c93e8c
parent c11274302ce55d8c33349913f12dd6edee4997e3
parent 8517b15d2a1b2c50227d149115d3a325ec6b5433
author Richard Frankel <rofrankel@google.com> 1486410785 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1486410785 +0000

Merge "conman:  React to mwifiex firmware resets."