Merge branch 'devel/master' into tizen
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 19 Jun 2018 04:33:10 +0000 (13:33 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 19 Jun 2018 04:33:20 +0000 (13:33 +0900)
commitc7a84c11c87624ec716d1c1b2641bd3944c2e6db
tree1be739dfd49fd645198288fbefc864f21182a6d5
parenta7c17fd7f51f408abae0ea2b85a8eb1b533bc7b0
parent0a6c603c50e4c0d8495f0e4154cb02e42f6f6653
Merge branch 'devel/master' into tizen