[dali_1.1.12] Merge branch 'devel/master' 90/52890/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 27 Nov 2015 10:17:46 +0000 (10:17 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 27 Nov 2015 10:17:47 +0000 (10:17 +0000)
commit8aa5b5aaaa25d0fd3bad166824ec3c93596f827d
treed7163d0cafc4b1fc07ecca7a9a9f4eb5301f7dba
parent408a61e446173b2ede857332db1c4587b3f4c230
parent2208fac9130160be59969e56621be0b74d41abc0
[dali_1.1.12] Merge branch 'devel/master'

Change-Id: I219814251150a6b0e45bca925809efb87c80a646