Merge "Fix a crash issue" into devel/master
authorHyunJu Shin <hyunjushin@samsung.com>
Thu, 9 Nov 2017 02:16:19 +0000 (02:16 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 9 Nov 2017 02:16:19 +0000 (02:16 +0000)

Trivial merge