Merge branch 'master' into resource-manipulation
authorhunje.yeon <hunje.yeon@samsung.com>
Thu, 4 Jun 2015 00:43:12 +0000 (09:43 +0900)
committerhunje.yeon <hunje.yeon@samsung.com>
Thu, 4 Jun 2015 00:45:43 +0000 (09:45 +0900)
commit8ba440a073c2b5496cfaa5e5606353dad515e3c0
tree24661cfdf0cefeb74a63ccee63665ad9eb7fdb6d
parented0b970a0c6e662fa5f3899ca472aeb9e398312d
parent2dbcd7cef008422ace67211d1023bbb28433682d
Merge branch 'master' into resource-manipulation

Update latest changes from master branch into resource-manipulation

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