[dali_1.2.12] Merge branch 'devel/master' 72/94372/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 28 Oct 2016 12:18:58 +0000 (13:18 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 28 Oct 2016 12:18:58 +0000 (13:18 +0100)
Change-Id: Iee3fb16d4cd87c14f8d21214ed424ded75317336


Trivial merge