[dali_1.1.27] Merge branch 'devel/master' 88/63588/1
authorTom Robinson <tom.robinson@samsung.com>
Thu, 24 Mar 2016 15:49:29 +0000 (15:49 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Thu, 24 Mar 2016 15:49:29 +0000 (15:49 +0000)
Change-Id: Ia899d17a7db1e33cd246d48e3779693f3bc14b8e


Trivial merge