[dali_1.0.15] Merge branch 'tizen' 12/29612/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 30 Oct 2014 10:13:34 +0000 (10:13 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 30 Oct 2014 10:14:09 +0000 (10:14 +0000)
Change-Id: Ifeb6b0642f8a367e62396cbf9dd171f2f8eb92f7


Trivial merge