Merge "Merge branch 'notification-service'"
authorMadan Lanka <lanka.madan@samsung.com>
Thu, 11 Aug 2016 15:57:54 +0000 (15:57 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Thu, 11 Aug 2016 15:57:54 +0000 (15:57 +0000)

Trivial merge