OSDN Git Service

am 535b94fa: Merge "Offer to detect non-SSL/TLS network traffic."
authorJeff Sharkey <jsharkey@android.com>
Fri, 16 Jan 2015 01:49:08 +0000 (01:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 16 Jan 2015 01:49:08 +0000 (01:49 +0000)
* commit '535b94fa9d88097220de3ea04cb8d9a91114baa8':
  Offer to detect non-SSL/TLS network traffic.

1  2 
server/CommandListener.cpp

Simple merge