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


Trivial merge