Merge branch 'tizen_4.0' into tizen 71/157771/1 accepted/tizen/unified/20171031.055613 submit/tizen/20171030.050248
authorGilbok Lee <gilbok.lee@samsung.com>
Thu, 26 Oct 2017 07:31:05 +0000 (16:31 +0900)
committerGilbok Lee <gilbok.lee@samsung.com>
Thu, 26 Oct 2017 07:31:19 +0000 (16:31 +0900)
Change-Id: Ia9a235161e662129a4c39dc3932db80fc85eaace


Trivial merge