[dali_1.2.43] Merge branch 'devel/master' 88/133288/3
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 9 Jun 2017 12:48:21 +0000 (13:48 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 9 Jun 2017 12:48:21 +0000 (13:48 +0100)
Change-Id: Ic218cd0377609c4e24ebd19ea4792ae7b57f1af9


Trivial merge