[dali_1.2.5] Merge branch 'devel/master' 17/87817/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 9 Sep 2016 13:02:56 +0000 (14:02 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 9 Sep 2016 13:02:56 +0000 (14:02 +0100)
Change-Id: Ica8b77154dddfba0ef4121ee7ba446ae9df18e7d


Trivial merge