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


Trivial merge