[dali_1.1.7] Merge branch 'devel/master' 40/50040/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Fri, 23 Oct 2015 10:01:09 +0000 (11:01 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Fri, 23 Oct 2015 10:01:09 +0000 (11:01 +0100)
commitfc74c49e34fbe0ba1dc3c5d86302e5cd3436e2ac
treec059227b6229fdaf95aa603398b664544282669c
parenteaa55256641593c18c3480c843a11ae74effd0d5
parentc0dcb9c9152f90940e66c7ffad04af28b9322cbe
[dali_1.1.7] Merge branch 'devel/master'

Change-Id: Icf5d9e2bffe4d282c415a2b48b41ab562fc4fb81