[dali_1.1.15] Merge branch 'devel/master' 30/55430/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 23 Dec 2015 17:22:36 +0000 (17:22 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 23 Dec 2015 17:22:36 +0000 (17:22 +0000)
commit5d1b1b8cae9c353706023fe36b82f59a002aa696
treec93f623d604c032b80d08bdf4ee487b63ec52591
parent2db41d48e4cf67acc19ff6b39d540e5c7edf0b07
parent92060d3ee54fd39c864cffea4e504714b5c5c4d9
[dali_1.1.15] Merge branch 'devel/master'

Change-Id: I5d7d7dc5a210c75eceb26aeec96f019ac99ba269