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


Trivial merge