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


Trivial merge