[dali_1.2.2] Merge branch 'devel/master' 81/84581/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 19 Aug 2016 10:00:08 +0000 (11:00 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 19 Aug 2016 10:00:08 +0000 (11:00 +0100)
Change-Id: Ia4c85347ab31c11c89a5d9fedca2103fab6d1f43


Trivial merge