merge tizen branch
authorlokilee73 <changjoo.lee@samsung.com>
Fri, 20 Jan 2017 03:53:22 +0000 (12:53 +0900)
committerlokilee73 <changjoo.lee@samsung.com>
Fri, 3 Feb 2017 04:11:25 +0000 (13:11 +0900)
Change-Id: I4ff8a6064473b9ba9d5c52d4a1656e4eb13b258e
Signed-off-by: lokilee73 <changjoo.lee@samsung.com>
1  2 
packaging/system-servant.spec
src/launcher/noti.c

Simple merge
Simple merge