[dali_1.3.22] Merge branch 'devel/master' 76/177376/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 27 Apr 2018 11:06:22 +0000 (12:06 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 27 Apr 2018 11:06:22 +0000 (12:06 +0100)
Change-Id: I6c19c8cd1c003bf56db69d24e1fd62fc98aa5105


Trivial merge