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


Trivial merge