[dali_1.0.36] Merge branch 'tizen' 29/37729/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 3 Apr 2015 05:51:36 +0000 (06:51 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 3 Apr 2015 05:51:36 +0000 (06:51 +0100)
Change-Id: Ida396c821cbdc7bd568f3d5199e2a6a58261d77b


Trivial merge