Merge "Updates following the PixelData change" into devel/master
authorKimmo Hoikka <kimmo.hoikka@samsung.com>
Fri, 3 Jun 2016 16:13:05 +0000 (09:13 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 3 Jun 2016 16:13:05 +0000 (09:13 -0700)

Trivial merge