[dali_1.1.42] Merge branch 'devel/master' 05/79205/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 8 Jul 2016 16:44:08 +0000 (17:44 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 8 Jul 2016 16:44:08 +0000 (17:44 +0100)
commit9e1352be921e56e5913bfee3780e0dfb7a3439e5
treeef7551096a2467308d1684d5068f96beab5af223
parent6545f971b9c5f3b8289fd17ce29081b17e8afa56
parent0e28b07de837084ccc561dab537896f6c6b32ac1
[dali_1.1.42] Merge branch 'devel/master'

Change-Id: I7f23a8bf3eb1db0acdd16c4cb1f688a19fe88719