[dali_1.3.25] Merge branch 'devel/master' 15/179615/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 18 May 2018 14:33:54 +0000 (15:33 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 18 May 2018 14:33:54 +0000 (15:33 +0100)
Change-Id: Ide000eae9e08ccd8ea0199be24ff3768126bb0ad


Trivial merge