Merge branch 'tizen' into feature/noti_ex feature/noti_ex
authorjusung son <jusung07.son@samsung.com>
Fri, 29 Mar 2019 05:39:55 +0000 (14:39 +0900)
committerjusung son <jusung07.son@samsung.com>
Fri, 29 Mar 2019 05:39:55 +0000 (14:39 +0900)
commit8cf6ca98110b621a6f5c33bb58bc1fd68af721d8
tree3ff2da72787fd61e9adca1cb8b5892d870f892b5
parent727ebe6820e16937c07f77ad92d9c467afaa8430
parent18d51ef8a88e1ace447813be77134bafc71cdb07
Merge branch 'tizen' into feature/noti_ex

Conflicts:
AUTHORS
CMakeLists.txt
LICENSE
packaging/notification.spec
AUTHORS
CMakeLists.txt
packaging/notification.spec