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


Trivial merge