[dali_1.1.12] Merge branch 'devel/master' 89/52889/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 27 Nov 2015 10:17:42 +0000 (10:17 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 27 Nov 2015 10:17:42 +0000 (10:17 +0000)
Change-Id: If550d48a4aaee4f8cc85b3588dbddfcf3d293a24


Trivial merge