[dali_1.1.31] Merge branch 'devel/master' 72/66972/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 22 Apr 2016 09:08:30 +0000 (10:08 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 22 Apr 2016 09:08:30 +0000 (10:08 +0100)
Change-Id: I3fc21172bd752ac9adaaece486f398b3a11e21ac


Trivial merge