Merge branch 'easysetup'
authorlankamadan <lanka.madan@samsung.com>
Fri, 4 Mar 2016 09:41:03 +0000 (18:41 +0900)
committerlankamadan <lanka.madan@samsung.com>
Fri, 4 Mar 2016 09:41:03 +0000 (18:41 +0900)
commitcf56a410a2150ae474c676e7e6d01b89552a4873
tree232a4fb96bee5864b022e47d912d96e19cfbc240
parent1a016ef372bd715d68e95fd54fc2d1af2f874a12
parentd5e816121ca378c31f980dd8cbc44c34d24513c7
Merge branch 'easysetup'

Conflicts:
android/android_api/base/jni/Android.mk
resource/csdk/security/provisioning/SConscript
tools/tizen/iotivity.spec

Change-Id: I85b5e3daad5055a1f1c36f3951476e84d0a05285
Signed-off-by: lankamadan <lanka.madan@samsung.com>
13 files changed:
android/android_api/base/jni/Android.mk
build_common/SConscript
resource/csdk/security/provisioning/SConscript
resource/provisioning/SConscript
resource/provisioning/examples/SConscript
service/SConscript
service/easy-setup/enrollee/src/onboarding.cpp
service/easy-setup/mediator/richsdk/SConscript
service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript
service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator_cpp.cpp
service/resource-encapsulation/unittests/DiscoveryManagerTest.cpp
tools/tizen/.gbs.conf
tools/tizen/iotivity.spec