Merge branch 'master' into easysetup 63/4163/3
authorlankamadan <lanka.madan@samsung.com>
Thu, 12 Nov 2015 02:49:10 +0000 (11:49 +0900)
committerlankamadan <lanka.madan@samsung.com>
Thu, 12 Nov 2015 04:54:18 +0000 (13:54 +0900)
commitd0baf5ae6936a16de6a49588428204d8c386ac9e
treed357ca78b7c0e9a68a2dafe33fad1b9aaadb4e05
parent9d449e55d968c4e51cd11415b11a0b43984fbcda
parent5565bfe4f9536cdaf57bc67c3bbdd109b567ec82
Merge branch 'master' into easysetup

Resolved following in merge from master

Conflicts:
service/SConscript
service/easy-setup/SConscript
service/easy-setup/sampleapp/enrollee/arduino/SConscript
service/easy-setup/sampleapp/enrollee/arduino/enrollee_wifi.cpp
service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle
service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/AndroidManifest.xml
service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/res/menu/main.xml
service/easy-setup/sampleapp/mediator/linux/SConscript
service/easy-setup/sampleapp/mediator/linux/mediator.cpp
service/easy-setup/sdk/common/common.h
service/easy-setup/sdk/enrollee/arduino/wifi/networkHandler.cpp
service/easy-setup/sdk/enrollee/common/inc/easysetup.h
service/easy-setup/sdk/enrollee/common/inc/resourceHandler.h
service/easy-setup/sdk/enrollee/common/src/easysetup.cpp
service/easy-setup/sdk/enrollee/common/src/resourceHandler.cpp
service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EasySetupService.java
service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/EnrolleeDevice.java
service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/IpOnBoardingConnection.java
service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/core/OnBoardingConfig.java
service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceFactory.java
service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/EnrolleeDeviceWiFiOnboarding.java
service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/impl/WiFiOnBoardingConfig.java
service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ProvisionEnrollee.java
service/easy-setup/sdk/mediator/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/ip/WiFiSoftAPManager.java
service/easy-setup/sdk/mediator/inc/prov_adapter.h
service/easy-setup/sdk/mediator/inc/provisioning.h
service/easy-setup/sdk/mediator/src/prov_adapter.cpp
service/easy-setup/sdk/mediator/src/provisioning.cpp
service/easy-setup/sdk/mediator/src/wifi_provisioning.cpp

Change-Id: I197e10e466ca08299dbcc58d78c72fb0b6d59e15
Signed-off-by: lankamadan <lanka.madan@samsung.com>
13 files changed:
service/SConscript
service/easy-setup/SConscript
service/easy-setup/sampleapp/enrollee/arduino/SConscript
service/easy-setup/sampleapp/enrollee/arduino/enrollee_wifi.cpp
service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/res/menu/main.xml
service/easy-setup/sampleapp/mediator/linux/SConscript
service/easy-setup/sampleapp/mediator/linux/mediator.cpp
service/easy-setup/sdk/enrollee/arduino/wifi/networkHandler.cpp
service/easy-setup/sdk/mediator/inc/prov_adapter.h
service/easy-setup/sdk/mediator/inc/provisioning.h
service/easy-setup/sdk/mediator/src/prov_adapter.cpp
service/easy-setup/sdk/mediator/src/provisioning.cpp
service/easy-setup/sdk/mediator/src/wifi_provisioning.cpp