[IOT-1089] Merge remote-tracking branch 'origin/master' into generic-java
authorGeorge Nash <george.nash@intel.com>
Tue, 8 Nov 2016 17:11:37 +0000 (09:11 -0800)
committerGeorge Nash <george.nash@intel.com>
Tue, 8 Nov 2016 21:44:13 +0000 (13:44 -0800)
commit5f7578bc8a1fbdabd20af011c6f664e74d83eab5
tree803a4d6bc7bcbc7879f25169cfa311175cf8ef40
parent18d2c3297c94b6bdb179270c97327187eb1a7945
parent52cf1dc74ecd8e1f58cf24b6b42798eebf4ef0ff
[IOT-1089] Merge remote-tracking branch 'origin/master' into generic-java

Change-Id: Ib37bdbb2955bdb0edc136786f1abf5a11c1489d6
Signed-off-by: George Nash <george.nash@intel.com>
27 files changed:
auto_build.py
build_common/SConscript
build_common/external_libs.scons
java/examples-android/devicediscoveryserver/src/main/java/org/iotivity/base/examples/DeviceDiscoveryServer.java
java/examples-android/provisioningclient/src/main/assets/oic_svr_db_client.dat
java/examples-android/provisioningclient/src/main/assets/oic_svr_db_client.json
java/examples-android/provisioningclient/src/main/java/org/iotivity/base/examples/provisioningclient/ProvisioningClient.java
java/examples-android/simpleclient/src/main/assets/oic_svr_db_client.dat
java/examples-android/simpleclient/src/main/assets/oic_svr_db_client.json
java/examples-android/simpleserver/src/main/assets/oic_svr_db_server.dat
java/examples-android/simpleserver/src/main/assets/oic_svr_db_server.json
java/iotivity-android/src/main/java/org/iotivity/base/OcPlatform.java
java/jni/JniOcCloudProvisioning.cpp
java/jni/JniOcPlatform.cpp
java/jni/JniOcPlatform.h
java/jni/JniOcProvisioning.cpp
java/jni/JniOcSecureResource.cpp
java/jni/JniOcStack.cpp
java/jni/JniOnMQSubscribeListener.h
service/notification/SConscript
service/notification/cpp-wrapper/consumer/SConscript
service/notification/cpp-wrapper/provider/SConscript
service/notification/examples/android/NotiConsumerExample/build.gradle
service/notification/examples/android/NotiProviderExample/build.gradle
service/resource-container/src/ResourceContainerImpl.cpp
service/resource-encapsulation/examples/android/RESampleClientApp/build.gradle
service/resource-encapsulation/examples/android/RESampleServerApp/build.gradle