| commit | 0174cd26bb1786e6dc7acefd1ae70a0ad2c76543 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Fri Jan 16 01:34:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 16 01:34:03 2015 +0000 |
| tree | 70409e262fce33c56bd565893fcb47ca09116a80 | |
| parent | 2f7ae528093ef4434e4d6380df0803cf70359971 [diff] | |
| parent | f24e490058bc59344f8bd10fb6cbbffa792fbc05 [diff] |
am f24e4900: Merge "Offer to detect non-SSL/TLS network traffic." * commit 'f24e490058bc59344f8bd10fb6cbbffa792fbc05': Offer to detect non-SSL/TLS network traffic.