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


Trivial merge