Merge branch 'master' into resource-manipulation
authorhunje.yeon <hunje.yeon@samsung.com>
Mon, 6 Jul 2015 01:23:08 +0000 (10:23 +0900)
committerhunje.yeon <hunje.yeon@samsung.com>
Mon, 6 Jul 2015 01:25:06 +0000 (10:25 +0900)
Apply stack error fix from 'master' branch into 'resource-manipulation' branch

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

Trivial merge