[dali_1.2.42] Merge branch 'devel/master' 63/132363/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 2 Jun 2017 11:56:33 +0000 (12:56 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 2 Jun 2017 11:56:33 +0000 (12:56 +0100)
commit30b39930a88d3d44cfea9a969c742d662666b149
tree812fdc81326462f45bbd94b9381bfec5ac088629
parent96d995c2f22cb20080496e7442c4683eccc62a99
parent4d7f29e0813d444d9a46cae690d053c443c72fcf
[dali_1.2.42] Merge branch 'devel/master'

Change-Id: Iee4b624e159ad90653e6eb602ee0da0187db4054