[dali_1.1.19] Merge branch 'devel/master' 47/58347/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 29 Jan 2016 11:34:08 +0000 (11:34 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 29 Jan 2016 11:34:08 +0000 (11:34 +0000)
commit3853b8f5e33a81dae7f929b82b3e891b1c3cb08b
tree62df251b49ac568638286be445e9a25ea35a4836
parentc8739c3d972177fe46b7704b8285c87b86fb0ad3
parent60161d426bff63bde47bedd17476a03771bba55b
[dali_1.1.19] Merge branch 'devel/master'

Change-Id: I0a2c6c568f3d4ef02f72e078ea5d6771dcb9c394