Merge branch 'master' into resource-manipulation
authorhunje.yeon <hunje.yeon@samsung.com>
Thu, 16 Jul 2015 08:29:20 +0000 (17:29 +0900)
committerhunje.yeon <hunje.yeon@samsung.com>
Thu, 16 Jul 2015 08:29:28 +0000 (17:29 +0900)
Apply recent changes of 'master' branch into 'resource-manipulation' branch

Change-Id: I201c7759d7ddbf2fd12440315968e270c360e265
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>

Trivial merge