Merge branch 'master' into resource-manipulation
authorhunje.yeon <hunje.yeon@samsung.com>
Wed, 17 Jun 2015 01:27:48 +0000 (10:27 +0900)
committerhunje.yeon <hunje.yeon@samsung.com>
Wed, 17 Jun 2015 01:28:17 +0000 (10:28 +0900)
Update recent changes of 'master' into 'resource-manipulation' branch

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

Trivial merge