[dali_1.1.33] Merge branch 'devel/master' 80/68580/1
authorDavid Steele <david.steele@samsung.com>
Fri, 6 May 2016 14:47:52 +0000 (15:47 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 6 May 2016 14:47:52 +0000 (15:47 +0100)
commit24b12e194dc413aa0f436447ae8c9ce42f7ee18c
tree5a96d6bd321451cdc5ba4a3e1aea4f20c36b2c1c
parentae229a3e6f09e97c05c98b370f7961e2eec3ed00
parent6b8f5f8db37d72e63d06f83657f9cb290fd28bcc
[dali_1.1.33] Merge branch 'devel/master'

Change-Id: Iab046a082b3b5fa488b57438f6b3a7ab12e98799