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


Trivial merge