Merge "Merge branch 'notification-service' to master branch."

author Uze Choi <uzchoi@samsung.com>

Wed, 14 Dec 2016 10:42:29 +0000 (10:42 +0000)

committer Gerrit Code Review <gerrit@172.30.200.205>

Wed, 14 Dec 2016 10:42:29 +0000 (10:42 +0000)
author Uze Choi <uzchoi@samsung.com>
Wed, 14 Dec 2016 10:42:29 +0000 (10:42 +0000)
committer Gerrit Code Review <gerrit@172.30.200.205>
Wed, 14 Dec 2016 10:42:29 +0000 (10:42 +0000)
diff --cc service/notification/SConscript
Simple merge
diff --cc service/notification/cpp-wrapper/consumer/SConscript
Simple merge
diff --cc service/notification/cpp-wrapper/provider/SConscript
Simple merge
diff --cc service/notification/src/common/NSUtil.c
Simple merge
author	Uze Choi <uzchoi@samsung.com>
	Wed, 14 Dec 2016 10:42:29 +0000 (10:42 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.205>
	Wed, 14 Dec 2016 10:42:29 +0000 (10:42 +0000)
		1	2
service/notification/SConscript	patch \|	diff1 \|	diff2 \|	blob \| history
service/notification/cpp-wrapper/consumer/SConscript	patch \|	diff1 \|	diff2 \|	blob \| history
service/notification/cpp-wrapper/provider/SConscript	patch \|	diff1 \|	diff2 \|	blob \| history
service/notification/src/common/NSUtil.c	patch \|	diff1 \|	diff2 \|	blob \| history