[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)
Change-Id: I90a5e9780680aa986f92bd6de28343f25f8bae5a


Trivial merge