[dali_1.2.39] Merge branch 'devel/master' 47/129047/1
authorDavid Steele <david.steele@samsung.com>
Fri, 12 May 2017 12:43:03 +0000 (13:43 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 12 May 2017 12:43:03 +0000 (13:43 +0100)
commit031055493575e669299fe916e87c06bc41cb4b17
treef48a66229837919647feb694cb647ececdca9f85
parent84d264499ca69e9bf9187afcbadbe3dc43c7b087
parent4a48c120071ebd293e3a528448ae779ac7aa5aef
[dali_1.2.39] Merge branch 'devel/master'

Change-Id: Ie6a8e357ae32a0ce4fad1d377dd02201bd9f9b18