Merge branch 'tizen_4.0' into tizen 01/155101/1
authorsangwan.kwon <sangwan.kwon@samsung.com>
Thu, 12 Oct 2017 05:38:04 +0000 (14:38 +0900)
committersangwan.kwon <sangwan.kwon@samsung.com>
Thu, 12 Oct 2017 05:38:55 +0000 (14:38 +0900)
Change-Id: Id39e536a81235b91d5852286c4ba433c5d5a098f
Signed-off-by: sangwan.kwon <sangwan.kwon@samsung.com>

Trivial merge