| commit | 6f9a6eed4c2c786b645ab3fb80ff9283593eed36 | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Tue May 10 00:29:22 2016 +0000 |
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | Tue May 10 00:29:22 2016 +0000 |
| tree | 594b4ba7cdd6e0772f74e46e3701bf225f22b569 | |
| parent | a2061f0b953a0d6a6b97bc8765045716ab5aa741 [diff] | |
| parent | f1aa2b3fddc1b3e261ea54635f148fdc120ae7cb [diff] |
Merge "[NAN] Do not reset state machine after OnNanDown" into mm-wireless-dev