[dali_1.2.9] Merge branch 'devel/master' 61/91461/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 7 Oct 2016 15:34:00 +0000 (16:34 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 7 Oct 2016 15:34:00 +0000 (16:34 +0100)
commitcf46347fe96910df6854b6fb080df1792a42a1fe
tree53c4dd67038a884e2057c31873a935041f7683d1
parent6e4f4a25d58c5ffee4f170f2c0560b05f2264b45
parent2715e437ad451a1c8ff1f114a6cb870c285a808a
[dali_1.2.9] Merge branch 'devel/master'

Change-Id: If2bc2998f3ccf16bcae69a173d712e54b42a0185