[dali_1.2.10] Merge branch 'devel/master' 35/92335/1
authorRichard Huang <r.huang@samsung.com>
Fri, 14 Oct 2016 13:17:55 +0000 (14:17 +0100)
committerRichard Huang <r.huang@samsung.com>
Fri, 14 Oct 2016 13:17:55 +0000 (14:17 +0100)
Change-Id: Ifa98519084d36ef1121682fcdc9ca29d9c8ce8ea


Trivial merge