[dali_1.2.5] Merge branch 'devel/master' 18/87818/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 9 Sep 2016 13:03:07 +0000 (14:03 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 9 Sep 2016 13:03:07 +0000 (14:03 +0100)
commit1396f5e795c16aaafb4cae934b30936273a33916
tree10b7450a4e83fea86b3b7d7a1cd90080fdb4f7ca
parent247281e4128df4903252263c6d86b11dafdd0bb9
parent575ed0209c3f43a855d57784c9d80694b4f45bce
[dali_1.2.5] Merge branch 'devel/master'

Change-Id: I7a4eeb8f27359a1d731fd73c2f784fd25a23cbce