[dali_1.1.25] Merge branch 'devel/master' 80/61980/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 11 Mar 2016 15:03:19 +0000 (15:03 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 11 Mar 2016 15:03:19 +0000 (15:03 +0000)
commitab15b8e1727ef7d2c472987f4872a7bf14419882
tree5846840247df8de8a855bd2d8ae294252deb4b23
parentbb392e18c8acda74f8eb38db19e289c868c07ea1
parent141836ef52887f5573ec374f73fc1ef0a0cb9423
[dali_1.1.25] Merge branch 'devel/master'

Change-Id: I2249d61b7cba27d69643444eb8e2e9dbef4a11a6