| commit | 0ec9c29fb724eef676d2472f2e15904ff8f52cc0 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Fri Jan 16 06:09:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 16 06:09:05 2015 +0000 |
| tree | 60e7a84d1d5d97f8aa4a08546be5e325f590a96c | |
| parent | 8ec2f1f04ea7958caac1ea5221178903621979a3 [diff] | |
| parent | c2ae6fb9ada52e9c990542a6d1cae80085318f31 [diff] |
am c2ae6fb9: Merge commit \'605eb79c9519307147fc1795d0eb155638a7f542\' into manualmerge * commit 'c2ae6fb9ada52e9c990542a6d1cae80085318f31': Offer to detect non-SSL/TLS network traffic.