[dali_1.1.36] Merge branch 'devel/master' 95/71895/1
authorRichard Huang <r.huang@samsung.com>
Fri, 27 May 2016 11:21:45 +0000 (12:21 +0100)
committerRichard Huang <r.huang@samsung.com>
Fri, 27 May 2016 11:21:45 +0000 (12:21 +0100)
Change-Id: I4fbcfcc6d979a76ecac18e3e3d9140aa78593d5c


Trivial merge