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


Trivial merge