[dali_1.2.13] Merge branch 'devel/master' 71/95771/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 4 Nov 2016 13:16:56 +0000 (13:16 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 4 Nov 2016 13:16:56 +0000 (13:16 +0000)
commit7abff56b51ffcbeb161120f984892c49b3ff0708
treecc661490a2c0f90779aa1678375253d11e04a3f1
parent20dc7bbe285c1143911f2103af3bcb8de6fad985
parent628594a0c24f5c3eb36aa48da3ab9f204e0028f7
[dali_1.2.13] Merge branch 'devel/master'

Change-Id: Ibbe21ea9b3b9f33053d5bbab501b98c12b5a38f7