[dali_1.2.39] Merge branch 'devel/master' 49/129049/1
authorDavid Steele <david.steele@samsung.com>
Fri, 12 May 2017 12:43:25 +0000 (13:43 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 12 May 2017 12:43:25 +0000 (13:43 +0100)
commitd83ad9c44e949249ef76c20b2379b0c7cec6d4a4
treec48da422599f0a76dffdc2760b17097e4dd1261d
parent35fdc8178d134261b84f267e3e3fc397763f1c13
parent3a81e76e2617fdda2bc084d125796289844a45b6
[dali_1.2.39] Merge branch 'devel/master'

Change-Id: I1dc9751c9631376e030c7376adee6092ada4e9e7