| commit | e86902584cf3cbe114f93e4fb6bc05b198aa0048 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Nov 13 10:27:13 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 13 10:27:13 2013 -0800 |
| tree | acbd6cd339347c1e7bdb04f42265fe0818c307b0 | |
| parent | 28786252886f6cd1d89bf4e6c2deeca1788ad5c3 [diff] | |
| parent | 0e0278e333aab7c87ae4d264d8ad1ab38c8b9b56 [diff] |
am 0e0278e3: am 5595f6de: Merge "Only initialize sniffers once, don\'t hold mutex while sniffing" into klp-dev * commit '0e0278e333aab7c87ae4d264d8ad1ab38c8b9b56': Only initialize sniffers once, don't hold mutex while sniffing