Merge branch 'master' into resource-manipulation
authorhunje.yeon <hunje.yeon@samsung.com>
Wed, 24 Jun 2015 07:34:16 +0000 (16:34 +0900)
committerhunje.yeon <hunje.yeon@samsung.com>
Wed, 24 Jun 2015 07:34:32 +0000 (16:34 +0900)
commite57727a4efb241a333a5d0a614d025bc032cf573
treec962f0fd561b4c01e7f4d2960aba3cf085d5f7c0
parente4fedac9cd05e9447d0cbf4ad76cc22f2e334c2c
parent073e992491cd89336b8483dabb62ece53570a13f
Merge branch 'master' into resource-manipulation

Update the last changes of 'master' into 'resource-manipulation' branch

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