[dali_1.2.36] Merge branch 'devel/master' 50/126450/1
authoradam.b <adam.b@samsung.com>
Fri, 21 Apr 2017 11:30:32 +0000 (12:30 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 21 Apr 2017 11:30:32 +0000 (12:30 +0100)
commit6e05d2da56fde9a67ff3ead673493879deaab301
tree3a4a0348f3e0d257a6667f71ce1532f0c6d8279c
parent18d81f40278596ca941101f9ecc6cad829e84ac1
parentcdad8840e2ef3e4f91334e306aafef78f5f212cb
[dali_1.2.36] Merge branch 'devel/master'

Change-Id: Ied3db40ab93fc8d57b4f6a3204369585d4ea5b4c