Merge branch 'tizen' into tizen_4.0 56/150556/1 accepted/tizen/4.0/unified/20170920.081338 submit/tizen_4.0/20170918.031048
authorGilbok Lee <gilbok.lee@samsung.com>
Mon, 18 Sep 2017 02:47:23 +0000 (11:47 +0900)
committerGilbok Lee <gilbok.lee@samsung.com>
Mon, 18 Sep 2017 02:47:28 +0000 (11:47 +0900)
Change-Id: If5670b55f9884adb3e793dce816699fb7f2757a8


Trivial merge