[dali_1.1.30] Merge branch 'devel/master' 76/66176/1
authorAdam Bialogonski <adam.b@samsung.com>
Fri, 15 Apr 2016 14:00:16 +0000 (15:00 +0100)
committerAdam Bialogonski <adam.b@samsung.com>
Fri, 15 Apr 2016 14:00:16 +0000 (15:00 +0100)
Change-Id: I33ce19ae36aafe268989ff40230611c11ddca4d8


Trivial merge