[dali_1.0.23] Merge branch 'tizen' 15/32815/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 24 Dec 2014 10:44:33 +0000 (10:44 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 24 Dec 2014 10:44:33 +0000 (10:44 +0000)
Change-Id: Ieb60b117c90756b0784338d6407351c0bc7ea8cb


Trivial merge