Merge "Merge branch 'master' into group-manager" into group-manager
authorMadan Lanka <lanka.madan@samsung.com>
Thu, 25 Feb 2016 00:45:05 +0000 (00:45 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Thu, 25 Feb 2016 00:45:05 +0000 (00:45 +0000)

Trivial merge