[dali_1.1.9] Merge branch 'devel/master' 13/51313/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 6 Nov 2015 10:37:37 +0000 (10:37 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 6 Nov 2015 10:37:37 +0000 (10:37 +0000)
commitbee076667baf97664b38aacdc4f7d7874a8540cc
tree395e7caf1518fc97c442ac75990db4a9259b2768
parentd23654c73e240cb25c8e22778793ccabf0affb77
parent1cb7a20f96e69dfb4b9061de2be89c9842582020
[dali_1.1.9] Merge branch 'devel/master'

Change-Id: I85f0b96947654217eef755d2e8d0b2d6fb5e53a4