[IOT-1089] Merge remote-tracking branch 'origin/master' into generic-java 31/14231/2
authorGeorge Nash <george.nash@intel.com>
Fri, 11 Nov 2016 18:23:17 +0000 (10:23 -0800)
committerGeorge Nash <george.nash@intel.com>
Fri, 11 Nov 2016 18:53:05 +0000 (10:53 -0800)
commit0cea71f91bc1c6d26bb705f3abace2c002321d56
tree810eeac06826f881bcf18349945992def88c96c1
parent5f7578bc8a1fbdabd20af011c6f664e74d83eab5
parent464121d7fd19b34afa6afc06a26333823ff722a1
[IOT-1089] Merge remote-tracking branch 'origin/master' into generic-java

Change-Id: I6627b56dbe51592159eefebde3f63480eb61f8ee
Signed-off-by: George Nash <george.nash@intel.com>
28 files changed:
build_common/SConscript
build_common/external_libs.scons
java/common/src/main/java/org/iotivity/base/OcResourceResponse.java
java/examples-android/fridgegroupserver/src/main/java/org/iotivity/base/examples/DoorResource.java
java/examples-android/fridgegroupserver/src/main/java/org/iotivity/base/examples/LightResource.java
java/examples-android/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/DeviceResource.java
java/examples-android/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/DoorResource.java
java/examples-android/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/LightResource.java
java/examples-android/presenceclient/src/main/java/org/iotivity/base/examples/PresenceClient.java
java/examples-android/presenceserver/src/main/java/org/iotivity/base/examples/PresenceServer.java
java/examples-android/simplebase/src/main/java/org/iotivity/base/examples/CloudFragment.java
java/examples-android/simplebase/src/main/res/layout/fragment_cloud.xml
java/examples-android/simplebase/src/main/res/layout/input.xml
java/examples-android/simpleserver/src/main/java/org/iotivity/base/examples/Light.java
java/examples-java/fridgegroupserver/src/main/java/org/iotivity/base/examples/DoorResource.java
java/examples-java/fridgegroupserver/src/main/java/org/iotivity/base/examples/LightResource.java
java/examples-java/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/DeviceResource.java
java/examples-java/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/DoorResource.java
java/examples-java/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/LightResource.java
java/examples-java/simpleserver/src/main/java/org/iotivity/base/examples/Light.java
java/iotivity-android/build.gradle
java/iotivity-android/src/androidTest/java/org/iotivity/base/SmokeTest.java
java/jni/JniOcResourceResponse.cpp
java/jni/JniOcResourceResponse.h
java/jni/JniOnPublishResourceListener.cpp
resource/docs/javadocGen.sh
service/easy-setup/mediator/richsdk/SConscript
service/notification/cpp-wrapper/provider/SConscript