Merge "Add Flexbox demo to the DALI demo launcher" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 25 Nov 2016 11:14:32 +0000 (03:14 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 25 Nov 2016 11:14:32 +0000 (03:14 -0800)

Trivial merge