[dali_1.2.24] Merge branch 'devel/master' 07/112207/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 27 Jan 2017 15:15:12 +0000 (15:15 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 27 Jan 2017 15:15:12 +0000 (15:15 +0000)
commit177c4949f8e8419d8cc3ca8aaae008460014616a
tree5c063c12fe6c602a04f07ba8864f1844f4b17c50
parent6e73d939b99ac4b32042d6c6104bdd8eddaebdfa
parentfa5c2bd76accd85deabe8060a74daafca7d85618
[dali_1.2.24] Merge branch 'devel/master'

Change-Id: I4fe0fed3fcd4b97eaae27d1db4d23ce2b44ef33c