Merge "Fix name conflict from parent class" into devel
authorhyokeun <hyokeun.jeon@samsung.com>
Wed, 7 Feb 2018 02:11:31 +0000 (02:11 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Wed, 7 Feb 2018 02:11:31 +0000 (02:11 +0000)
commit6db4123110821cc18be079350b6db0003f63bedb
tree238ccf745fac4693bbcd5521598fb468b6861480
parente165df3179abde26e0058b1f6b6af93a375616e2
parent6dd373e65fc4aa51855c5d17776a9cd80bd02f5d
Merge "Fix name conflict from parent class" into devel