Merge branch 'resource-container' 39/5239/2
authorMarkus Jung <markus.jung@samsung.com>
Mon, 29 Feb 2016 00:23:09 +0000 (09:23 +0900)
committerMarkus Jung <markus.jung@samsung.com>
Mon, 29 Feb 2016 04:20:47 +0000 (13:20 +0900)
commit084ac4fa5ac4792acb4d5123e13bcbadab803001
tree49f341623aea660df8d7f1411e5ae4a3a9d44f90
parente60a6e33844c79ba6a8394e618977885a9499c78
parent82ea1301a5597506a37be7829c819251be4c4b39
Merge branch 'resource-container'

Conflicts:
service/resource-container/examples/ContainerSample.cpp
service/resource-container/include/RCSBundleInfo.h
service/resource-container/src/BundleResource.cpp
service/resource-container/src/ResourceContainerImpl.cpp
service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp

Change-Id: I84024311d8285a0356bcdccfec20bb38d41a9d98
Signed-off-by: Markus Jung <markus.jung@samsung.com>
19 files changed:
service/SConscript
service/resource-container/android/resource-container/src/main/jni/JniBundleResource.cpp
service/resource-container/android/resource-container/src/main/jni/JniBundleResource.h
service/resource-container/bundle-api/include/BundleResource.h
service/resource-container/examples/BMISensorBundle/src/BMISensorResource.cpp
service/resource-container/examples/ContainerSampleClient.cpp
service/resource-container/examples/DiscomfortIndexSensorBundle/src/DiscomfortIndexSensorResource.cpp
service/resource-container/examples/android/RCSampleServerApp/app/build.gradle
service/resource-container/include/RCSBundleInfo.h
service/resource-container/src/BundleResource.cpp
service/resource-container/src/Configuration.cpp
service/resource-container/src/DiscoverResourceUnit.cpp
service/resource-container/src/DiscoverResourceUnit.h
service/resource-container/src/JavaBundleResource.cpp
service/resource-container/src/RemoteResourceUnit.cpp
service/resource-container/src/ResourceContainerImpl.cpp
service/resource-container/src/ResourceContainerImpl.h
service/resource-encapsulation/src/resourceClient/RCSRemoteResourceObject.cpp
service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp