[dali_1.2.15] Merge branch 'devel/master' 32/98732/1
authorUmar <m.umar@partner.samsung.com>
Fri, 18 Nov 2016 10:59:13 +0000 (10:59 +0000)
committerUmar <m.umar@partner.samsung.com>
Fri, 18 Nov 2016 10:59:14 +0000 (10:59 +0000)
commit574ce69b5c6abe40f245aa2dc7e36e55ca873995
tree367f3a47d2b0b973a071aef48460312ac886274a
parentfc829906bc88730e08c8d483a351bd1a1ffc563f
parentf879ae5b3d982ca9e36262f58f534d7a6ca5de77
[dali_1.2.15] Merge branch 'devel/master'

Change-Id: Ida5c0d24314be226157405462e7a1181185808ce