[IOT-1089] Merge remote-tracking branch 'origin/master' into generic-java
authorGeorge Nash <george.nash@intel.com>
Fri, 9 Dec 2016 00:07:49 +0000 (16:07 -0800)
committerGeorge Nash <george.nash@intel.com>
Fri, 9 Dec 2016 15:35:36 +0000 (07:35 -0800)
commit193edabdd8c126603dbad6f7158b95282b5ef2d4
tree7baa43151b4183d47a750b0b25692fbfc75613ec
parentdbced416e09b2d252219c1791f0eac3a2226753a
parentd646926ebdf6d2621e156b8ac7b8ddb2ca8dce36
[IOT-1089] Merge remote-tracking branch 'origin/master' into generic-java

Change-Id: Ic21559c8bb95f93ab82d8b2d8f443e14ae470654
Signed-off-by: George Nash <george.nash@intel.com>
30 files changed:
build_common/SConscript
java/common/src/main/java/org/iotivity/base/MVJustWorksOptionMask.java
java/common/src/main/java/org/iotivity/base/OcAccountManager.java
java/common/src/main/java/org/iotivity/base/OcCloudProvisioning.java
java/common/src/main/java/org/iotivity/base/OcDirectPairDevice.java
java/common/src/main/java/org/iotivity/base/OcPlatformInfo.java
java/common/src/main/java/org/iotivity/base/OcProvisioning.java
java/common/src/main/java/org/iotivity/base/OcResource.java
java/common/src/main/java/org/iotivity/base/OcSecureResource.java
java/common/src/main/java/org/iotivity/base/ResourceProperty.java
java/examples-android/provisioningclient/src/main/AndroidManifest.xml
java/examples-android/provisioningclient/src/main/assets/oic_svr_db_client.dat
java/examples-android/provisioningclient/src/main/java/org/iotivity/base/examples/provisioningclient/ProvisioningClient.java
java/examples-android/provisioningclient/src/main/res/menu/menu_secure_provision_client.xml
java/iotivity-android/src/main/java/org/iotivity/base/OcPlatform.java
java/iotivity-android/src/main/java/org/iotivity/ca/CaInterface.java
java/jni/JniConfirmNumListener.cpp
java/jni/JniConfirmNumListener.h
java/jni/JniDisplayPinListener.h
java/jni/JniDisplayVerifyNumListener.cpp
java/jni/JniDisplayVerifyNumListener.h
java/jni/JniOcCloudProvisioning.h
java/jni/JniOcProvisioning.cpp
java/jni/JniOcProvisioning.h
java/jni/JniOcSecureResource.h
java/jni/JniPinCheckListener.h
java/jni/JniProvisionResultListner.h
java/jni/JniSecureUtils.h
java/jni/SConscript
resource/docs/javadocGen.sh