Merge branch 'devel/master' into tizen
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 19 Jun 2018 02:19:35 +0000 (11:19 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 19 Jun 2018 02:19:46 +0000 (11:19 +0900)
Change-Id: I8a592167076edbd1bca13d8fef0e85711112cbbd


Trivial merge