[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)
Change-Id: I6a67d3a02dd57479adfc9fc26f6083c0b1c0e36b


Trivial merge