[dali_1.1.30] Merge branch 'devel/master' 74/66174/1
authorAdam Bialogonski <adam.b@samsung.com>
Fri, 15 Apr 2016 13:59:57 +0000 (14:59 +0100)
committerAdam Bialogonski <adam.b@samsung.com>
Fri, 15 Apr 2016 13:59:57 +0000 (14:59 +0100)
Change-Id: I920f0f9567921035067dbb04c33b0ed7a37c5f61


Trivial merge