[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)
commitb15279dd1e820bebf41aeb78453f997fe50051ae
tree89b67c3fe26481870dd5855afd0a8e77029c7652
parent3e6769f502e8ce54a9ddd4579707438bb5827a62
parentff3591a305a48c72421a565573715a1238f9479b
[dali_1.2.12] Merge branch 'devel/master'

Change-Id: Iee3fb16d4cd87c14f8d21214ed424ded75317336