[dali_1.1.42] Merge branch 'devel/master' 04/79204/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 8 Jul 2016 16:43:58 +0000 (17:43 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 8 Jul 2016 16:43:58 +0000 (17:43 +0100)
commit61d6ba2fce226b6956e2aedb35f9d21b52e80381
tree78a35407be68e255885df73e29cfee9051b31ce8
parenta78d385498e3f18233ba6e71482fb527ac5c5d11
parent2e57178d07630c9234f7fb61a1e7e5ed5c958aa4
[dali_1.1.42] Merge branch 'devel/master'

Change-Id: I41afa4c2e8e5cae0c455681f197e5088c4bb8970