Merge remote-tracking branch 'origin/tizen_4.0' into tizen 54/178754/1
authorKichan Kwon <k_c.kwon@samsung.com>
Mon, 14 May 2018 01:32:16 +0000 (10:32 +0900)
committerKichan Kwon <k_c.kwon@samsung.com>
Mon, 14 May 2018 01:32:29 +0000 (10:32 +0900)
Change-Id: If29909e9d04c869fb4b1266a1fd192cf67fe28bb
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>

Trivial merge