Merge branch 'devel/master' into tizen 82/168682/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 30 Jan 2018 06:46:28 +0000 (15:46 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 30 Jan 2018 06:46:38 +0000 (15:46 +0900)
Change-Id: Ic65a654ecc9a71295e2f880e8fbbd3b140db6151


Trivial merge