[dali_1.2.2] Merge branch 'devel/master' 79/84579/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 19 Aug 2016 09:59:28 +0000 (10:59 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 19 Aug 2016 09:59:28 +0000 (10:59 +0100)
Change-Id: I2b95b1e838c7b744e064ef446d2fd2321a2bc990


Trivial merge