[dali_1.1.33] Merge branch 'devel/master' 81/68581/1
authorDavid Steele <david.steele@samsung.com>
Fri, 6 May 2016 14:48:00 +0000 (15:48 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 6 May 2016 14:48:00 +0000 (15:48 +0100)
commitb936651d1ccf66163c2ed8e381229e8f3618cc7b
tree175c642d8772b6a7afc3e52d8d28f3bfb68f496e
parent24d1c5037a28d3b8e9094dbb65630687e079705a
parenta8abad3ca46394d5574070749dbd2dfd0ba95beb
[dali_1.1.33] Merge branch 'devel/master'

Change-Id: Ic6fd89cf01a3c41395d7f8bc4b7f9500a5fd8433