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)
commitcbbba8973023236d911927788c60d6f66cad0f83
tree72261137b4569191338512b90f8081b1d6377eee
parent98a16daf384a7932d3f81242b962c4baf422851e
parentb2f2076a79aee404a8c01d2d01e576fce780558d
Merge "Merge branch 'master' into resource-encapsulation" into resource-encapsulation