[dali_1.2.7] Merge branch 'devel/master' 47/89447/1
authorDavid Steele <david.steele@partner.samsung.com>
Fri, 23 Sep 2016 12:57:44 +0000 (13:57 +0100)
committerDavid Steele <david.steele@partner.samsung.com>
Fri, 23 Sep 2016 12:57:44 +0000 (13:57 +0100)
commit4616ef8a4ad89c235b6d982f7ca746ac09783b51
tree8124ce28d29d1470057d7b34d0167c81dd1bb0cc
parentcf8382280ea70e3f56b4007d6e3ed4922fc6885a
parent8977d4081a5b927cd3ff414a0923a7ebfcb17658
[dali_1.2.7] Merge branch 'devel/master'

Change-Id: I0b9b74021ba883818d5c1dd0f6cff3d6b2f817bf