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


Trivial merge