Merge 'security-basecamp' branch into master with CBOR
authorSachin Agrawal <sachin.agrawal@intel.com>
Wed, 15 Jul 2015 16:40:26 +0000 (09:40 -0700)
committerSachin Agrawal <sachin.agrawal@intel.com>
Wed, 15 Jul 2015 16:40:26 +0000 (09:40 -0700)
commit5afbbb1a9974d2fc1251fcab00c4100fb5ac4f3d
treee9f5205a8b3fab0963dc164776a58411becdd9a2
parentb98fcc1da7da56590cdcc6d86ed1b872e3ba3554
parent27be45b68702765c41b5628a748f2f80a0f792e3
Merge 'security-basecamp' branch into master with CBOR

security-basecamp for 0.9.2 is merged in master brach.

Change-Id: Ia5cd2710a688d3e631009ed03f7e5eb97aba5d24
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
14 files changed:
android/android_api/base/jni/Android.mk
android/android_api/base/jni/JniOcPlatform.cpp
android/android_api/base/jni/JniOcPlatform.h
android/android_api/base/src/main/java/org/iotivity/base/OcPlatform.java
resource/csdk/security/include/internal/srmresourcestrings.h
resource/csdk/security/provisioning/SConscript
resource/csdk/security/provisioning/src/provisioningmanager.c
resource/csdk/security/src/policyengine.c
resource/csdk/security/src/srmresourcestrings.c
resource/examples/simpleclient.cpp
resource/include/OCApi.h
resource/include/OCSerialization.h
resource/src/OCPlatform_impl.cpp
resource/unittests/OCPlatformTest.cpp