Merge branch 'tizen' into tizen_4.0 81/151881/1 accepted/tizen/4.0/unified/20170925.071901 submit/tizen_4.0/20170922.110813
authorjinwang.an <jinwang.an@samsung.com>
Fri, 22 Sep 2017 08:12:47 +0000 (17:12 +0900)
committerjinwang.an <jinwang.an@samsung.com>
Fri, 22 Sep 2017 08:13:22 +0000 (17:13 +0900)
Change-Id: I5e88d456d36d9fb017ad7298a5171a0065132cc4
Signed-off-by: jinwang.an <jinwang.an@samsung.com>

Trivial merge