Merge branch 'devel/master' into tizen_4.0 33/155733/1 accepted/tizen/4.0/unified/20171017.212923 submit/tizen_4.0/20171017.144330 submit/tizen_4.0/20171017.145254 tizen_4.0.m2_release
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 16 Oct 2017 05:03:20 +0000 (14:03 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 16 Oct 2017 05:03:29 +0000 (14:03 +0900)
Change-Id: I1135ff681a7f303dcdd44716ef968b2c24a1ddf8


Trivial merge