Merge branch 'tizen_base' into tizen 18/167018/1
authorDongHun Kwak <dh0128.kwak@samsung.com>
Mon, 15 Jan 2018 05:11:43 +0000 (14:11 +0900)
committerDongHun Kwak <dh0128.kwak@samsung.com>
Mon, 15 Jan 2018 05:12:09 +0000 (14:12 +0900)
Change-Id: Ifc92991a09de7bcd7e28f6428aeb206aebfefb6a
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

Trivial merge