Merge branch 'master' into resource-manipulation
authorhunje.yeon <hunje.yeon@samsung.com>
Thu, 11 Jun 2015 14:32:00 +0000 (23:32 +0900)
committerhunje.yeon <hunje.yeon@samsung.com>
Thu, 11 Jun 2015 15:16:13 +0000 (00:16 +0900)
commit2c79c70f6cf44c590dbe04ebbd9a1f656856c8a3
tree35717a9046026026da6b15d7722014b86d408c68
parent81b879f5daf3bebbe2e9ffacd0ebcb59620cbc30
parent56ae5f078f9b10ac9c2eb53342b8e11c1efda0a8
Merge branch 'master' into resource-manipulation

update latest changes of master branch to resource-manipulation branch

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