Merge branch '1.3-rel (82aa07b) 77/22477/2
authorGeorge Nash <george.nash@intel.com>
Thu, 14 Sep 2017 22:15:43 +0000 (15:15 -0700)
committerGeorge Nash <george.nash@intel.com>
Thu, 14 Sep 2017 22:15:43 +0000 (15:15 -0700)
commit0a4fdaaa9978398b91923676cee05c2f7c9a437e
tree037777b5b028af1bb8cb198383bf8774e25aeaed
parent517577ce4804ab1b794f98dc6a31ebb649590a7e
parent82aa07bea31ec4df38f6934f9dc7fa74ed61ffb5
Merge branch '1.3-rel (82aa07b)

Relate-to:
https://gerrit.iotivity.org/gerrit/22227
https://gerrit.iotivity.org/gerrit/21895
https://gerrit.iotivity.org/gerrit/21631
https://gerrit.iotivity.org/gerrit/21673
https://gerrit.iotivity.org/gerrit/22131
https://gerrit.iotivity.org/gerrit/21475
https://gerrit.iotivity.org/gerrit/21981
https://gerrit.iotivity.org/gerrit/22175
https://gerrit.iotivity.org/gerrit/21913
https://gerrit.iotivity.org/gerrit/22025
https://gerrit.iotivity.org/gerrit/22293
https://gerrit.iotivity.org/gerrit/22015
https://gerrit.iotivity.org/gerrit/21743
https://gerrit.iotivity.org/gerrit/22299
https://gerrit.iotivity.org/gerrit/22125
https://gerrit.iotivity.org/gerrit/22257

Conflicts:
    build_common/linux/SConscript
    extlibs/android/sdk/SConscript

Bug: https://jira.iotivity.org/browse/IOT-2453
Change-Id: I713e205c601439bf590a89e4dc6b440f2b6bce00
Signed-off-by: George Nash <george.nash@intel.com>
21 files changed:
build_common/SConscript
build_common/linux/SConscript
resource/csdk/connectivity/src/SConscript
resource/csdk/connectivity/src/caprotocolmessage.c
resource/csdk/resource-directory/src/rd_server.c
resource/csdk/resource-directory/unittests/rdtests.cpp
resource/csdk/security/provisioning/src/ocprovisioningmanager.c
resource/csdk/security/src/deviceonboardingstate.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/pstatresource.c
resource/csdk/security/src/resourcemanager.c
resource/csdk/stack/include/internal/ocstackinternal.h
resource/csdk/stack/include/ocpayload.h
resource/csdk/stack/octbstack_product.def
resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp
resource/csdk/stack/src/occollection.c
resource/csdk/stack/src/ocpayload.c
resource/csdk/stack/src/ocserverrequest.c
resource/csdk/stack/test/stacktests.cpp
resource/include/OCSerialization.h
resource/src/InProcClientWrapper.cpp