Merge branch 'tizen_base' into tizen 20/183620/1 tizen
authorDongHun Kwak <dh0128.kwak@samsung.com>
Mon, 9 Jul 2018 05:29:36 +0000 (14:29 +0900)
committerDongHun Kwak <dh0128.kwak@samsung.com>
Mon, 9 Jul 2018 05:31:25 +0000 (14:31 +0900)
Change-Id: I5fe04e1751131662a7e7b34e2707a5dbadb75f18
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

Trivial merge