[dali_1.1.31] Merge branch 'devel/master' 73/66973/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 22 Apr 2016 09:08:35 +0000 (10:08 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 22 Apr 2016 09:08:35 +0000 (10:08 +0100)
Change-Id: I644ed1b09b5a5f8b3ffeafde16d6fa537d0dfbd0


Trivial merge