[dali_1.3.38] Merge branch 'devel/master' 84/187484/1
authorAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 23 Aug 2018 14:03:09 +0000 (15:03 +0100)
committerAnton Obzhirov <a.obzhirov@samsung.com>
Thu, 23 Aug 2018 14:03:09 +0000 (15:03 +0100)
Change-Id: Ia32faf670bb37ef42253b0ab6d8fdae60adb4188


Trivial merge