Merge branch 'devel/master' into tizen
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 20 Aug 2018 05:05:50 +0000 (14:05 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 20 Aug 2018 05:05:55 +0000 (14:05 +0900)
Change-Id: I14a31ace7454080e23eb17028ddacbadaa4190a8


Trivial merge