[dali_1.2.3] Merge branch 'devel/master' 63/85663/1
authorUmar <m.umar@partner.samsung.com>
Fri, 26 Aug 2016 09:27:56 +0000 (10:27 +0100)
committerUmar <m.umar@partner.samsung.com>
Fri, 26 Aug 2016 09:27:56 +0000 (10:27 +0100)
Change-Id: Ic3081c205b0a5a9a22ae3326b748908a3374405a


Trivial merge