[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)
commit4149a38415c2ac291217fa2fe1d651153dacaa6b
tree719562289cec09482ee3436bc2b6e821b7647fd2
parent654883a2444be217daca83df32c411bb0628bf4a
parentbeb2373b81241acaa22a57309f9a3c9ba4b3c30e
[dali_1.2.46] Merge branch 'devel/master'

Change-Id: I30e2de525c14fa83c8603f27f318841450afdbbb