[dali_1.1.13] Merge branch 'devel/master' 92/53392/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 4 Dec 2015 11:03:48 +0000 (11:03 +0000)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 4 Dec 2015 11:03:48 +0000 (11:03 +0000)
Change-Id: Icc4b04e233366d1931753aa73ba804339c4a380a


Trivial merge