[dali_1.2.15] Merge branch 'devel/master' 30/98730/1
authorUmar <m.umar@partner.samsung.com>
Fri, 18 Nov 2016 10:58:55 +0000 (10:58 +0000)
committerUmar <m.umar@partner.samsung.com>
Fri, 18 Nov 2016 10:58:56 +0000 (10:58 +0000)
commitd949c5d33642952500927df924714b3c5790750d
treea7b439a9c9254228ad632d973431d3353d3051b6
parent57d1b821320145a6c0e5e22c3759a62aaf70a5de
parent401d361199a9a5d6fdf55d2cfa05be738dbfec2f
[dali_1.2.15] Merge branch 'devel/master'

Change-Id: Iac6ae38704a73651c26a6d9c4ff6ea954740377f