[dali_1.1.30] Merge branch 'devel/master' 77/66177/1
authorAdam Bialogonski <adam.b@samsung.com>
Fri, 15 Apr 2016 14:00:22 +0000 (15:00 +0100)
committerAdam Bialogonski <adam.b@samsung.com>
Fri, 15 Apr 2016 14:00:22 +0000 (15:00 +0100)
commit6081c160daa8cac70730dfe0e927cc7de8c38207
tree05adbd63af599525cb4e8e708729f55437199346
parentc795cd5e6f523f73a5fe648f97ccc5728f5da404
parentff13ec38295fe200e40f029f4258cf9b3655ece1
[dali_1.1.30] Merge branch 'devel/master'

Change-Id: I90a5e9780680aa986f92bd6de28343f25f8bae5a