Merge branch 'master' into resource-manipulation
authorhunje.yeon <hunje.yeon@samsung.com>
Fri, 3 Jul 2015 07:21:44 +0000 (16:21 +0900)
committerhunje.yeon <hunje.yeon@samsung.com>
Fri, 3 Jul 2015 07:21:57 +0000 (16:21 +0900)
commite258465880a69835a8597de64d61a1f851b818d3
treebf4fad0c3875f8045f61f76e660508bdf88deaf7
parent45caebadaf478ef9c42ff52a8621b22521b20f07
parentecd70e9f74875f50a75957d429b152749099102a
Merge branch 'master' into resource-manipulation

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

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