| commit | ebd1bfead5d82ec509449843dd51eef1c6cf41ef | [log] [tgz] |
|---|---|---|
| author | Dmitry Grinberg <dmitrygr@google.com> | Thu May 08 18:31:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 08 18:31:26 2014 +0000 |
| tree | edaaf45d7720225eefab0ed81d44d74dbac7a248 | |
| parent | 6a7345804c51f820715d5d904c53837fc4805f46 [diff] | |
| parent | 6ddda3a87d8ab516cd996cd1bf59b33c3136d7ee [diff] |
am 6ddda3a8: (-s ours) am c90b5ab2: DO NOT MERGE: allow customization of sniff params * commit '6ddda3a87d8ab516cd996cd1bf59b33c3136d7ee': DO NOT MERGE: allow customization of sniff params