[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)
commiteb99acef953e7741c402b72aacf334974e98d4f1
tree144dfb2eb082db2fc3ea74de72b339eb1ef91598
parentd991abc0eabf237f44fcaedab03314ba6b315504
parente5ec2d162468518d8f987384e6b24b454424e27d
[dali_1.3.25] Merge branch 'devel/master'

Change-Id: Ide000eae9e08ccd8ea0199be24ff3768126bb0ad