[dali_1.2.34] Merge branch 'devel/master' 96/123896/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 7 Apr 2017 10:11:42 +0000 (11:11 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 7 Apr 2017 10:11:42 +0000 (11:11 +0100)
commitb1584015ee16a6053819b39f1da54c06f2affce6
tree881e79311ba36bf8b22d0943342c72ddacb1c88e
parente9dafd8227dc8d72cc4d02f0e14c2e9e929cb635
parentc7ecbc205aa3ffe7f51a1b3740347e6fd641b779
[dali_1.2.34] Merge branch 'devel/master'

Change-Id: Ibd8f116da49f913e23a254f529a9e95d212796f8