[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)
Change-Id: Ida5c0d24314be226157405462e7a1181185808ce


Trivial merge