Merge branch 'tizen_3.0' into tizen

author Hwankyu Jhun <h.jhun@samsung.com>

Wed, 4 Jan 2017 08:02:35 +0000 (17:02 +0900)

committer Hwankyu Jhun <h.jhun@samsung.com>

Wed, 4 Jan 2017 08:04:26 +0000 (17:04 +0900)
author Hwankyu Jhun <h.jhun@samsung.com>
Wed, 4 Jan 2017 08:02:35 +0000 (17:02 +0900)
committer Hwankyu Jhun <h.jhun@samsung.com>
Wed, 4 Jan 2017 08:04:26 +0000 (17:04 +0900)
diff --cc src/debugger_info.c
Simple merge
diff --cc src/launchpad_common.c
Simple merge
author	Hwankyu Jhun <h.jhun@samsung.com>
	Wed, 4 Jan 2017 08:02:35 +0000 (17:02 +0900)
committer	Hwankyu Jhun <h.jhun@samsung.com>
	Wed, 4 Jan 2017 08:04:26 +0000 (17:04 +0900)
		1	2
src/debugger_info.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/launchpad_common.c	patch \|	diff1 \|	diff2 \|	blob \| history