[dali_1.0.18] Merger branch 'tizen' 76/30576/1
authorXiangyin Ma <x1.ma@samsung.com>
Thu, 20 Nov 2014 13:14:04 +0000 (13:14 +0000)
committerXiangyin Ma <x1.ma@samsung.com>
Thu, 20 Nov 2014 13:14:42 +0000 (13:14 +0000)
Change-Id: I84bbac2d34d178c840c3e585f4db81428e2a7ab1


Trivial merge