[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)
commit99f5ab570796d673595a04c8d460e460e8268a62
treeef46cd009f524fd73dd2f276c6a9b9eac121a204
parentd0641c99b5f097f199f6526881da79632c5ccaab
parentdd2cc88eea5a365703f042ef2e6bc77d5f92a245
[dali_1.2.2] Merge branch 'devel/master'

Change-Id: I2b95b1e838c7b744e064ef446d2fd2321a2bc990