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


Trivial merge