diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-01-16 01:49:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 01:49:08 +0000 |
| commit | 732c34ee7cf9fdd93e8e2aa41bac1df231d9b50b (patch) | |
| tree | 0379e17965c5e6b915d8df3dfc32f5c83cd09c89 /server/InterfaceController.cpp | |
| parent | 7e9527b45d818829093545bf6abe3e1952c73e86 (diff) | |
| parent | 535b94fa9d88097220de3ea04cb8d9a91114baa8 (diff) | |
am 535b94fa: Merge "Offer to detect non-SSL/TLS network traffic."
* commit '535b94fa9d88097220de3ea04cb8d9a91114baa8':
Offer to detect non-SSL/TLS network traffic.
Diffstat (limited to 'server/InterfaceController.cpp')
0 files changed, 0 insertions, 0 deletions