Merge branch 'tizen' into tizen_4.0 accepted/tizen/4.0/unified/20171122.071110 submit/tizen_4.0/20171102.094014 submit/tizen_4.0/20171103.015252 submit/tizen_4.0/20171120.032205
authorMyungki Lee <mk5004.lee@samsung.com>
Thu, 2 Nov 2017 11:08:12 +0000 (20:08 +0900)
committerMyungki Lee <mk5004.lee@samsung.com>
Thu, 2 Nov 2017 11:08:12 +0000 (20:08 +0900)
Signed-off-by: Myungki Lee <mk5004.lee@samsung.com>
Conflicts:
packaging/notification.spec

Change-Id: Ibe16d79f9944d703f61e0151900a9017f47200a9


Trivial merge