[dali_1.2.37] Merge branch 'devel/master' 18/127718/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 28 Apr 2017 10:33:33 +0000 (11:33 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 28 Apr 2017 10:33:34 +0000 (11:33 +0100)
Change-Id: I15895d1fdf177877c9cff6031843d35f5ab90e49


Trivial merge