Merge "Updates following FrameCallback changes" into devel/master
authorDavid Steele <david.steele@samsung.com>
Fri, 12 Oct 2018 13:23:43 +0000 (13:23 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 12 Oct 2018 13:23:43 +0000 (13:23 +0000)

Trivial merge