[dali_1.2.12] Merge branch 'devel/master' 73/94373/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 28 Oct 2016 12:19:18 +0000 (13:19 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 28 Oct 2016 12:19:18 +0000 (13:19 +0100)
Change-Id: Icdce160338bab16c9065ef87108b8031f0df8aec


Trivial merge