Merge branch 'master' into cloud-interface 33/18433/3
authorJee Hyeok Kim <jihyeok13.kim@samsung.com>
Mon, 3 Apr 2017 04:20:22 +0000 (13:20 +0900)
committerJee Hyeok Kim <jihyeok13.kim@samsung.com>
Tue, 4 Apr 2017 04:00:33 +0000 (04:00 +0000)
commit0d6fbbd9fb4c2f93252496632fd8fe06d672d28c
tree4081ce8eb60ab3c24ee9661d222922b83306fc5c
parent2073eaec267fac4d441a2e1c1ca6dfbd77962b92
parenta77b5e09f7df92ad3470fcf2006aec1a25af9fd8
Merge branch 'master' into cloud-interface

Change-Id: I90cc0049c72082a1ce630e9c7bade9d67e1afd0f
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
cloud/samples/client/SConscript
cloud/samples/client/thin_light/thin_room_light.cpp
resource/csdk/stack/src/ocstack.c