Merge branch 'master' into resource-manipulation
authorhunje.yeon <hunje.yeon@samsung.com>
Fri, 10 Jul 2015 04:40:19 +0000 (13:40 +0900)
committerhunje.yeon <hunje.yeon@samsung.com>
Fri, 10 Jul 2015 04:40:26 +0000 (13:40 +0900)
commitb58560a0cba36152569518ee3eb24a42d5599021
tree32899328b72df469d03861250e73cf70efab33bc
parent6ae44f1897e512cb12969a821256d9c65a1ec97c
parentd4782e35f1727418a3dfcadea34783a6acfa9bd4
Merge branch 'master' into resource-manipulation

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

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