[dali_1.2.6] Merge branch 'devel/master' 36/88336/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 16 Sep 2016 09:56:15 +0000 (10:56 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 16 Sep 2016 09:56:15 +0000 (10:56 +0100)
commitcf8382280ea70e3f56b4007d6e3ed4922fc6885a
tree903c4a61ca7fdd93bfb80e9b08c81cf6f2a2ccc3
parentd8e8f7de1ff30edb599d422b7a0bc2ae259f4ee5
parent144b10cc1eef2eb60727a4734c5d7dff47143331
[dali_1.2.6] Merge branch 'devel/master'

Change-Id: Ic2bc52d057d76f583fcb1a78be5a69e725c09030