[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)
Change-Id: I7a4eeb8f27359a1d731fd73c2f784fd25a23cbce


Trivial merge