[dali_1.2.36] Merge branch 'devel/master' 51/126451/1
authoradam.b <adam.b@samsung.com>
Fri, 21 Apr 2017 11:30:48 +0000 (12:30 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 21 Apr 2017 11:30:48 +0000 (12:30 +0100)
commita7a16401984febfe04f4f0b4846c0c77540b9ba6
treea3c608a8e48b77694b278d5d311f4628c5b168db
parent76e1a81ad9b5d97aa111c5d62033ac0723ce2579
parentb61a47572ae107efa23a8857001239e004d4a968
[dali_1.2.36] Merge branch 'devel/master'

Change-Id: Id7712a06c89d3d0edc170efdd297f7fba441652a