Merge branch 'master' into cloud-interface

author Jee Hyeok Kim <jihyeok13.kim@samsung.com>

Mon, 3 Apr 2017 04:20:22 +0000 (13:20 +0900)

committer Jee Hyeok Kim <jihyeok13.kim@samsung.com>

Tue, 4 Apr 2017 04:00:33 +0000 (04:00 +0000)
author Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Mon, 3 Apr 2017 04:20:22 +0000 (13:20 +0900)
committer Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Tue, 4 Apr 2017 04:00:33 +0000 (04:00 +0000)
diff --cc cloud/samples/client/SConscript
Simple merge
diff --cc cloud/samples/client/thin_light/thin_room_light.cpp
Simple merge
diff --cc resource/csdk/stack/src/ocstack.c

index e910ee3,c597ce5..c597ce5

mode 100644,100755..100644
--- 1/resource/csdk/stack/src/ocstack.c
--- 2/resource/csdk/stack/src/ocstack.c
+++ b/resource/csdk/stack/src/ocstack.c
author	Jee Hyeok Kim <jihyeok13.kim@samsung.com>
	Mon, 3 Apr 2017 04:20:22 +0000 (13:20 +0900)
committer	Jee Hyeok Kim <jihyeok13.kim@samsung.com>
	Tue, 4 Apr 2017 04:00:33 +0000 (04:00 +0000)
		1	2
cloud/samples/client/SConscript	patch \|	diff1 \|	diff2 \|	blob \| history
cloud/samples/client/thin_light/thin_room_light.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
resource/csdk/stack/src/ocstack.c	patch \|	diff1 \|	diff2 \|	blob \| history