Merge branch 'master' into resource-manipulation
authorhunje.yeon <hunje.yeon@samsung.com>
Fri, 3 Jul 2015 07:21:44 +0000 (16:21 +0900)
committerhunje.yeon <hunje.yeon@samsung.com>
Fri, 3 Jul 2015 07:21:57 +0000 (16:21 +0900)
Update the lastest changes of 'master' into 'resource-manipulation' branch

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

Trivial merge