[dali_1.2.51] Merge branch 'devel/master' 93/142593/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 4 Aug 2017 10:44:49 +0000 (11:44 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 4 Aug 2017 10:44:49 +0000 (11:44 +0100)
commitcbd11099b8ab422dd74b921044a3e2218ab294f4
treee1fd1b57637c0fa4c420645879f1ae1fffc765f4
parent8e1d322d2e00dc0dfac611507fb1bd7cb72c96be
parent6ec1fa94bf8d5d2275f7f6dbb116904b7e4a98b5
[dali_1.2.51] Merge branch 'devel/master'

Change-Id: I668cd85ffe0a0f2cd8d1e99964258499b6dc76fe