Merge "Merge branch 'master' into resource-encapsulation" into resource-encapsulation
authorMadan Lanka <lanka.madan@samsung.com>
Fri, 18 Sep 2015 09:44:02 +0000 (09:44 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Fri, 18 Sep 2015 09:44:02 +0000 (09:44 +0000)

Trivial merge