Merge branch 'devel/master' into tizen 87/168687/1 accepted/tizen/unified/20180206.064211 submit/tizen/20180205.023347 submit/tizen/20180205.100518
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 30 Jan 2018 06:51:48 +0000 (15:51 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 30 Jan 2018 06:52:07 +0000 (15:52 +0900)
Change-Id: Ia6ccc401b3300012066c36bf0356113f260722e6


Trivial merge