[dali_1.1.3] Merge branch 'devel/master' 55/48355/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 18 Sep 2015 10:03:45 +0000 (11:03 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 18 Sep 2015 10:03:45 +0000 (11:03 +0100)
Change-Id: I7bfe198ba4590cd26b0e7ce569525d67b6d8c537


Trivial merge