Merge branch 'tizen_base' into tizen 05/170305/1 tizen
authorDongHun Kwak <dh0128.kwak@samsung.com>
Mon, 19 Feb 2018 04:16:21 +0000 (13:16 +0900)
committerDongHun Kwak <dh0128.kwak@samsung.com>
Mon, 19 Feb 2018 04:16:21 +0000 (13:16 +0900)
Change-Id: Ie3ef0a1a0ead9d53e762bc7196d5bbe2949786a7
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

Trivial merge