[dali_1.2.11] Merge branch 'devel/master' 19/93319/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 21 Oct 2016 14:10:04 +0000 (15:10 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 21 Oct 2016 14:10:04 +0000 (15:10 +0100)
commit4cd0c17c9421378d74fe95d1bd2970d84a9d9453
tree8241b09a57dd6a36798cbcd24916d6da047a109d
parentf391811faf0b99b43abb358791b85a658dfc7b30
parent4182fdb74a2c2c9b14f136dbe820e28aaa79537a
[dali_1.2.11] Merge branch 'devel/master'

Change-Id: I346006b79d13c0012d9a5c8fa86e524a22dc012b