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


Trivial merge