[dali_1.1.37] Merge branch 'devel/master' 19/73019/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 3 Jun 2016 13:34:18 +0000 (14:34 +0100)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 3 Jun 2016 13:34:18 +0000 (14:34 +0100)
commit661bf429a56def085e118b5c7a48ae48ee41c86e
tree9aa7202868a1e9ca4b8088fc49f590cde6b87cd4
parent10f86c69033974fcf4e9bec31036099b55f8a403
parent53e919933f971f9fbb4d8ab797a7f3da5a79e621
[dali_1.1.37] Merge branch 'devel/master'

Change-Id: If92872f458358103be0a553d7f88089db9454862