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


Trivial merge