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


Trivial merge