[dali_1.1.24] Merge branch 'devel/master' 26/61326/1
authorFerran Sole <ferran.sole@samsung.com>
Mon, 7 Mar 2016 09:08:22 +0000 (09:08 +0000)
committerFerran Sole <ferran.sole@samsung.com>
Mon, 7 Mar 2016 09:08:22 +0000 (09:08 +0000)
Change-Id: I3b4fc5ec05004797a0aef3369d04ecfe366f4086


Trivial merge