[dali_1.1.36] Merge branch 'devel/master' 96/71896/1
authorRichard Huang <r.huang@samsung.com>
Fri, 27 May 2016 11:21:50 +0000 (12:21 +0100)
committerRichard Huang <r.huang@samsung.com>
Fri, 27 May 2016 11:21:50 +0000 (12:21 +0100)
commit9c779d53223a5eae3be6f8af12954cea364a606b
tree21768aa8cfdc6572b6f2a4e023b2bd5172b6abf1
parent87b87263ddda2188a86217cca356932e36e4cd94
parent544eaccb4c3585ae92ef272e0ca9ff95e18b0e8d
[dali_1.1.36] Merge branch 'devel/master'

Change-Id: I6a67d3a02dd57479adfc9fc26f6083c0b1c0e36b