Merge branch 'devel/master' into tizen 56/168656/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 30 Jan 2018 05:30:16 +0000 (14:30 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 30 Jan 2018 05:30:23 +0000 (14:30 +0900)
Change-Id: Iceec4cd3700ce091016a4161b10c1e978b42848a


Trivial merge