[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)
commit86a0a83bfad7dfbfd6c08c911b11d259c840fb21
treec6270b25be36a0518c0a065d70d304316f5d2b35
parentbfd6c56d4d17e2bf752845693e2df370444a6ebf
parentd28ad2aef295b9654b1060fb286ff0463093d121
[dali_1.2.50] Merge branch 'devel/master'

Change-Id: Ia6aac3f51114478b99cc70e2fc31a02227f16eef