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


Trivial merge