Merge "Merge branch 'master' into notification-service" into notification-service
authorMadan Lanka <lanka.madan@samsung.com>
Fri, 5 Aug 2016 05:18:03 +0000 (05:18 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Fri, 5 Aug 2016 05:18:04 +0000 (05:18 +0000)

Trivial merge