[dali_1.2.42] Merge branch 'devel/master' 64/132364/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 2 Jun 2017 11:56:48 +0000 (12:56 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 2 Jun 2017 11:56:48 +0000 (12:56 +0100)
commitde1fd913be651474ecbcc5212f0a331f0803ac48
tree234f2b12f5126a3388ab97df4ff90ce1ea6a5a32
parentc5532e5780e20d0631ab90e5bc592a158ffc3d74
parenta223aecbbcf1e34c8a4ca1618e62d2099914ceb1
[dali_1.2.42] Merge branch 'devel/master'

Change-Id: I96af28a60865083861d7723e9c7583274974513c