Merge "fix crash: HasBody() null reference" into devel/master
authorDavid Steele <david.steele@samsung.com>
Mon, 25 Sep 2017 10:15:03 +0000 (10:15 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 25 Sep 2017 10:15:03 +0000 (10:15 +0000)

Trivial merge