Merge "Fix crash issue" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 12 May 2017 18:18:22 +0000 (18:18 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 12 May 2017 18:18:22 +0000 (18:18 +0000)

Trivial merge