Merge branch 'tizen_4.0' into tizen 55/155255/2 accepted/tizen/unified/20171017.070838 submit/tizen/20171016.094605
authorSooyoung Ha <yoosah.ha@samsung.com>
Mon, 16 Oct 2017 06:58:57 +0000 (15:58 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Mon, 16 Oct 2017 06:59:32 +0000 (15:59 +0900)
Change-ID: Idb12e939fc5438aafd358f8ccdc5ce87596ef63f
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

Trivial merge