[dali_1.2.42] Merge branch 'devel/master' 61/132361/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 2 Jun 2017 11:56:12 +0000 (12:56 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 2 Jun 2017 11:56:12 +0000 (12:56 +0100)
commit7ab969fbd5e091f206a3407f7da115aaf103d3cc
treeb7addc3e597f3152eaca018d6013a25408a6783c
parent56cc187f6a376cce673392857ea9ac34bca6f303
parent198c199bbd9d751eddd478c4fbf39b864c25c0b6
[dali_1.2.42] Merge branch 'devel/master'

Change-Id: I7f18c98827816533d93a463b54028147d1b8f271