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


Trivial merge