Merge "Merge branch 'master' into resource-encapsulation" into resource-encapsulation
authorMadan Lanka <lanka.madan@samsung.com>
Wed, 16 Sep 2015 00:26:19 +0000 (00:26 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Wed, 16 Sep 2015 00:26:19 +0000 (00:26 +0000)

Trivial merge