[dali_1.1.11] Merge branch 'devel/master' 85/52285/1
authorRichard Huang <r.huang@samsung.com>
Fri, 20 Nov 2015 10:58:53 +0000 (10:58 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 20 Nov 2015 10:58:53 +0000 (10:58 +0000)
Change-Id: I0b46b3d93eb35506f70be536ed5de59f887c3295


Trivial merge