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


Trivial merge