[dali_1.2.46] Merge branch 'devel/master' 15/136615/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 30 Jun 2017 10:21:41 +0000 (11:21 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 30 Jun 2017 10:21:41 +0000 (11:21 +0100)
commitfcb200502b88962903a1405fb1a5cb230f78a261
treeb307bf447a865aaef5de92014f62b00dfc4da37f
parent463f354df725674c8f7ecc9b8f00ce7bdd6e2d10
parentd8a62ef92f9ddecc199eb88ed7698194bc539662
[dali_1.2.46] Merge branch 'devel/master'

Change-Id: I3d0506b29bf71bc849a8ee3d60d8b7059108647d