[dali_1.2.22] Merge branch 'devel/master' 98/110298/1
authorDavid Steele <david.steele@samsung.com>
Fri, 13 Jan 2017 14:36:46 +0000 (14:36 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 13 Jan 2017 14:36:46 +0000 (14:36 +0000)
commite93c7dc0fa84baca2c3c31df6fa83ceccd5d40af
treed61fc634eace7ea1e85cc01b68b92e241cc51b2b
parent483ee611c7cf108f4b1ac85f42636fdbf7067c2b
parent113045797ac855c7f7c98d593c4ade597e09d1b7
[dali_1.2.22] Merge branch 'devel/master'

Change-Id: Ia7debed3a9a2107c251247df4b519e19bfd60985