Merge "Merge remote-tracking branch 'origin/master' into notification-service" into...
authorMadan Lanka <lanka.madan@samsung.com>
Tue, 9 Aug 2016 06:47:16 +0000 (06:47 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Tue, 9 Aug 2016 06:47:16 +0000 (06:47 +0000)

Trivial merge