[dali_1.2.46] Merge branch 'devel/master' 15/136615/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 30 Jun 2017 10:21:41 +0000 (11:21 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 30 Jun 2017 10:21:41 +0000 (11:21 +0100)
Change-Id: I3d0506b29bf71bc849a8ee3d60d8b7059108647d


Trivial merge