[dali_1.2.30] Merge branch 'devel/master' 67/118467/1
authorDavid Steele <david.steele@samsung.com>
Fri, 10 Mar 2017 15:02:08 +0000 (15:02 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 10 Mar 2017 15:02:08 +0000 (15:02 +0000)
commit190a30974e11c5792335e3b0493bf1c212beec6a
tree330f9e2a6c049bb20301afff1fbbffc4abf5daa2
parente1d3366cda5ce5fabc3f5117b67409d748d6b03d
parenteb36a2149c2d82b51b028a6d93740893d5c2c035
[dali_1.2.30] Merge branch 'devel/master'

Change-Id: I78de0c8a24b7c9abdf6d43b86f03e804abc9ef0a