[dali_1.1.20] Merge branch 'devel/master' 51/58951/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 5 Feb 2016 08:53:44 +0000 (08:53 +0000)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 5 Feb 2016 08:53:44 +0000 (08:53 +0000)
Change-Id: I09009ccbf42e5a4dd33277eb6bd5b732b9fbbae9


Trivial merge