Merge "[CA Integration] Updated C sample apps to accept connectivity type param"...

author Sudarshan Prasad <sudarshan.prasad@intel.com>

Thu, 25 Dec 2014 01:20:14 +0000 (01:20 +0000)

committer Gerrit Code Review <gerrit@172.30.200.205>

Thu, 25 Dec 2014 01:20:14 +0000 (01:20 +0000)
author Sudarshan Prasad <sudarshan.prasad@intel.com>
Thu, 25 Dec 2014 01:20:14 +0000 (01:20 +0000)
committer Gerrit Code Review <gerrit@172.30.200.205>
Thu, 25 Dec 2014 01:20:14 +0000 (01:20 +0000)
diff --cc resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp
Simple merge
author	Sudarshan Prasad <sudarshan.prasad@intel.com>
	Thu, 25 Dec 2014 01:20:14 +0000 (01:20 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.205>
	Thu, 25 Dec 2014 01:20:14 +0000 (01:20 +0000)