Merge branch 'devel/master' into tizen
authorminho.sun <minho.sun@samsung.com>
Thu, 2 Aug 2018 01:27:07 +0000 (10:27 +0900)
committerminho.sun <minho.sun@samsung.com>
Thu, 2 Aug 2018 01:27:07 +0000 (10:27 +0900)
commitb01be2f480b3549750dc594f5b8cdda67f1a9622
tree40a73c1f1de4c0b7a2cd51bedac7aed796fcb4b5
parentb138f432a937efdffad7902d5db5588650b219ba
parent37259c312ac648e3835a9e1acf60b4518cab38a8
Merge branch 'devel/master' into tizen