[dali_1.1.43] Merge branch 'devel/master' 62/80262/1
authorDavid Steele <david.steele@samsung.com>
Fri, 15 Jul 2016 11:27:31 +0000 (12:27 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 15 Jul 2016 11:27:31 +0000 (12:27 +0100)
commit9e6fd5c8ae44b09b759674e98135d57b29bd88e4
treef896c26edf448cdaebe2e26b6750e11355f73b88
parent01e2bff4fdf8b6212f71f7e38d87a7bb1ceff14f
parentcbfdbccd825dbe976f024e08b01da5d002551d50
[dali_1.1.43] Merge branch 'devel/master'

Change-Id: I142799c2ad5f46d3e692dfaaeceb9776657ff5ae