Merge "Merge from master to CA branch" into connectivity-abstraction
authorSudarshan Prasad <sudarshan.prasad@intel.com>
Thu, 25 Dec 2014 11:03:15 +0000 (11:03 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Thu, 25 Dec 2014 11:03:15 +0000 (11:03 +0000)
commitd6017a71bacbdcaeddc079b2a6987e7e0fdaa583
tree771fffa1a4e2e69eb0d911243c1aa6c18e766bd3
parent50ca157e26a84325b559ab34525340bf3157f4cc
parent17f82e70a3815536a6cd3eb6aa4dc0c3a49cdcad
Merge "Merge from master to CA branch" into connectivity-abstraction
resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp