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>

diff --git a/service/SConscript b/service/SConscript
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/service/easy-setup/SConscript b/service/easy-setup/SConscript
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/service/easy-setup/sampleapp/enrollee/arduino/SConscript b/service/easy-setup/sampleapp/enrollee/arduino/SConscript
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/service/easy-setup/sampleapp/enrollee/arduino/enrollee_wifi.cpp b/service/easy-setup/sampleapp/enrollee/arduino/enrollee_wifi.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle
old mode 100644 (file)
new mode 100755 (executable)
index fa408da..c249744
--- a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle
+++ b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle
@@ -18,6 +18,4 @@ android {
 }\r
 \r
 dependencies {\r
-    compile project(':EasySetupCore-debug')\r
-    compile project(':iotivity-armeabi-base-debug')\r
 }
\ No newline at end of file

diff --git a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/AndroidManifest.xml b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/AndroidManifest.xml
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/res/menu/main.xml b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/res/menu/main.xml
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/service/easy-setup/sampleapp/mediator/linux/SConscript b/service/easy-setup/sampleapp/mediator/linux/SConscript
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/service/easy-setup/sampleapp/mediator/linux/mediator.cpp b/service/easy-setup/sampleapp/mediator/linux/mediator.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/service/easy-setup/sdk/enrollee/arduino/wifi/networkHandler.cpp b/service/easy-setup/sdk/enrollee/arduino/wifi/networkHandler.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/service/easy-setup/sdk/mediator/inc/prov_adapter.h b/service/easy-setup/sdk/mediator/inc/prov_adapter.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/service/easy-setup/sdk/mediator/inc/provisioning.h b/service/easy-setup/sdk/mediator/inc/provisioning.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/service/easy-setup/sdk/mediator/src/prov_adapter.cpp b/service/easy-setup/sdk/mediator/src/prov_adapter.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/service/easy-setup/sdk/mediator/src/provisioning.cpp b/service/easy-setup/sdk/mediator/src/provisioning.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/service/easy-setup/sdk/mediator/src/wifi_provisioning.cpp b/service/easy-setup/sdk/mediator/src/wifi_provisioning.cpp
old mode 100644 (file)
new mode 100755 (executable)