[dali_1.3.11] Merge branch 'devel/master' 26/169826/1
authoradam.b <adam.b@samsung.com>
Fri, 9 Feb 2018 11:09:52 +0000 (11:09 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 9 Feb 2018 11:09:52 +0000 (11:09 +0000)
Change-Id: Iacf3a77ff4a0e366a6270ceb352284508c910c9d


Trivial merge