[dali_1.1.36] Merge branch 'devel/master' 97/71897/1
authorRichard Huang <r.huang@samsung.com>
Fri, 27 May 2016 11:22:01 +0000 (12:22 +0100)
committerRichard Huang <r.huang@samsung.com>
Fri, 27 May 2016 11:22:01 +0000 (12:22 +0100)
Change-Id: I67e2b3f98a4c983f5e7b73bfae81ebd79bcf61d3


Trivial merge