Update certificate-provisioin & acl-provision
authorHeewon Park <h_w.park@samsung.com>
Mon, 29 Aug 2016 08:30:25 +0000 (17:30 +0900)
committerUze Choi <uzchoi@samsung.com>
Wed, 31 Aug 2016 01:05:36 +0000 (01:05 +0000)
commitbb6e58784bcdecaaccf3442f973f5d6a185bee56
treef58dbf05dc583299bdb77345af37f150f19ce756
parent79fda9737ad7916a2a885944de343afe6a5dbc19
Update certificate-provisioin & acl-provision

Conflicts:

        service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/CloudProp.java

Change-Id: Iddb5023ddfee34190502223a7f63c15c7230d988
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10905
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/CloudProp.java
service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/RemoteEnrollee.java
service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniRemoteEnrollee.cpp
service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniRemoteEnrollee.h
service/easy-setup/mediator/richsdk/inc/ESRichCommon.h
service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp
service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.h
service/easy-setup/mediator/richsdk/src/RemoteEnrollee.cpp