Merge branch 'master' into resource-manipulation
authorhunje.yeon <hunje.yeon@samsung.com>
Thu, 16 Jul 2015 08:29:20 +0000 (17:29 +0900)
committerhunje.yeon <hunje.yeon@samsung.com>
Thu, 16 Jul 2015 08:29:28 +0000 (17:29 +0900)
commitdcae2d53bbffaf0a3e3cd3a58f2198f20dbe1cfc
tree1ad2e8b2824a1a93edf5557df79925649f3cb338
parent6ad11133a66eadead1877ce1758e93482b28081c
parent1503c9caacfc486e7208e6a71b3293ad282ab2b1
Merge branch 'master' into resource-manipulation

Apply recent changes of 'master' branch into 'resource-manipulation' branch

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