Merge remote-tracking branch 'origin/master' into easysetup, Provisioning Handler...
authorsandipan.p <sandipan.p@samsung.com>
Tue, 8 Sep 2015 10:14:32 +0000 (15:44 +0530)
committersandipan.p <sandipan.p@samsung.com>
Tue, 8 Sep 2015 10:16:17 +0000 (15:46 +0530)
commitda09afd6d11d40b87cac4c129979d24392f2b2ff
treeca9c6e1e6b9b7cd6c193cef26b12a9274a3c3783
parentfcb2de769c5089ff64e8fc9b8ffc15df045e18e9
parent0cf008a96ec37fec868d03dbdec4653f9db83495
Merge remote-tracking branch 'origin/master' into easysetup, Provisioning Handler changes and NDK-build fix

-Vinil Jain

Change-Id: Ia5e04b1efba94f7c178b7034147ca0722b29bd4f
Signed-off-by: sandipan.p <sandipan.p@samsung.com>
resource/csdk/stack/src/ocstack.c
service/easy-setup/sdk/enrollee/common/src/resourceHandler.cpp
service/easy-setup/sdk/mediator/android/jni/Android.mk
service/easy-setup/sdk/mediator/inc/provisioninghandler.h
service/easy-setup/sdk/mediator/src/provisioninghandler.cpp