Merge remote-tracking branch 'origin/master' into generic-java

Change-Id: Iff187c8462c8b4fa52a96a6bd020997b6c19439c
Signed-off-by: George Nash <george.nash@intel.com>

diff --cc build_common/external_libs.scons
Simple merge

diff --cc java/examples-android/cloudprovisioningclient/src/main/assets/oic_svr_db_client.dat
index 4b5b918,91be3ca..91be3ca
mode 100755,100644..100644
Binary files differ

diff --cc java/examples-android/cloudprovisioningclient/src/main/assets/oic_svr_db_client.json
index 09cc117,03bca8c..03bca8c
mode 100755,100644..100644
--- 1/java/examples-android/cloudprovisioningclient/src/main/assets/oic_svr_db_client.json
--- 2/android/examples/cloudprovisioningclient/src/main/assets/oic_svr_db_client.json
+++ b/java/examples-android/cloudprovisioningclient/src/main/assets/oic_svr_db_client.json

diff --cc java/examples-android/cloudprovisioningclient/src/main/java/org/iotivity/base/examples/cloudprovisioningclient/CloudProvisioningClient.java
Simple merge

diff --cc java/examples-android/provisioningclient/src/main/assets/oic_svr_db_client.dat
index 6b67286,f3cf369..f3cf369
Binary files differ

diff --cc java/examples-android/provisioningclient/src/main/assets/oic_svr_db_client.json
Simple merge

diff --cc java/examples-android/simpleclient/src/main/assets/oic_svr_db_client.dat
index c6c73ed,3a61974..3a61974
Binary files differ

diff --cc java/examples-android/simpleclient/src/main/assets/oic_svr_db_client.json
Simple merge

diff --cc java/examples-android/simpleserver/src/main/assets/oic_svr_db_server.dat
index b5eae8f,1c6c9e1..1c6c9e1
Binary files differ

diff --cc java/examples-android/simpleserver/src/main/assets/oic_svr_db_server.json
Simple merge

diff --cc java/iotivity-android/src/main/java/org/iotivity/base/OcPlatform.java
Simple merge

diff --cc java/iotivity-android/src/main/java/org/iotivity/ca/CaInterface.java
Simple merge

diff --cc java/jni/JniCaInterface.c
Simple merge

diff --cc java/jni/JniOcPlatform.cpp
Simple merge

diff --cc java/jni/JniOcPlatform.h
Simple merge

diff --cc resource/csdk/connectivity/api/cautilinterface.h
index 04e79a5,2a82bcb..d1ff8a2
--- 1/resource/csdk/connectivity/api/cautilinterface.h
--- 2/resource/csdk/connectivity/api/cautilinterface.h
+++ b/resource/csdk/connectivity/api/cautilinterface.h
@@@ -167,7 -157,12 +167,12 @@@ void CAUtilSetFoundDeviceListener(jobje
   */
  CAResult_t CAUtilSetLEScanInterval(jint intervalTime, jint workingCount);
  
 -#endif
+ /**
+  * stop LE scan.
+  * @return  ::CA_STATUS_OK or ::CA_NOT_SUPPORTED
+  */
+ CAResult_t CAUtilStopLEScan();
 +#endif //__JAVA__
  
  #ifdef __cplusplus
  } /* extern "C" */

diff --cc resource/csdk/connectivity/util/src/cautilinterface.c
Simple merge

diff --cc service/notification/SConscript
Simple merge