[dali_1.2.36] Merge branch 'devel/master' 49/126449/1
authoradam.b <adam.b@samsung.com>
Fri, 21 Apr 2017 11:30:24 +0000 (12:30 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 21 Apr 2017 11:30:24 +0000 (12:30 +0100)
commit02846d87019deecc2798a232d35691aac3892634
treebf75597465816549898f7f78545e4c744db65e65
parentc137780f242bc5f4d11095f8e08a3e3f722bcd1e
parent5d1cb15c000635b58924fffcfa537e09388da3eb
[dali_1.2.36] Merge branch 'devel/master'

Change-Id: Ie447fbc406ebd3c601e256678aab7227347477b4