[dali_1.2.50] Merge branch 'devel/master' 32/141232/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 28 Jul 2017 15:55:37 +0000 (16:55 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 28 Jul 2017 15:55:37 +0000 (16:55 +0100)
Change-Id: Ia6aac3f51114478b99cc70e2fc31a02227f16eef


Trivial merge