[dali_1.1.35] Merge branch 'devel/master' 57/70757/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 20 May 2016 10:18:20 +0000 (11:18 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 20 May 2016 10:18:20 +0000 (11:18 +0100)
commitefa341d5ca5e10b93499358cb38c19aa2b1fef80
tree7f9c8eaa0f9070460771075a86157a8c34252efc
parent4a0542cdee8fac2ef942fe1552fa14ae81f8dacb
parent0c5eaf9972a0c5cfcd47c86bc675238e439451ea
[dali_1.1.35] Merge branch 'devel/master'

Change-Id: I53776d49f53aaddd7a30eb9fe0fdf7ba017d618f