[dali_1.2.36] Merge branch 'devel/master' 48/126448/1
authoradam.b <adam.b@samsung.com>
Fri, 21 Apr 2017 11:30:10 +0000 (12:30 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 21 Apr 2017 11:30:10 +0000 (12:30 +0100)
commit5ff7b9d254e6c4f623df42c07d1ac8abaabd8699
tree430040de4445b0445f0dcf75ce6f23eb83e02548
parente5c8f41c1f0613593e3f2f1a1376b36443ffeb52
parent802e6d354166a946241efad9801f2e7cc6aabd0a
[dali_1.2.36] Merge branch 'devel/master'

Change-Id: Ibf74b4a3a70d6744d273463c83fa5ffa3a03c795