[dali_1.2.14] Merge branch 'devel/master' 63/97263/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 11 Nov 2016 18:40:58 +0000 (18:40 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 11 Nov 2016 18:40:59 +0000 (18:40 +0000)
commit0485eb19cef73f9fefbeef5f764dc3b6756c2a84
treeeef76738323957be7e59ff035156ac429ab07a4b
parented5b970f9108e0a63e1e7af5ffc7e1eee7f73a8b
parentcf12cbc792277b72bef44850ba6eefe8d4d1b745
[dali_1.2.14] Merge branch 'devel/master'

Change-Id: Ie3ffed75c9ae34aae54543f05e8f6a9a40f68305