Merge "Add FlexLayout." into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 13 Jun 2018 12:04:17 +0000 (12:04 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Wed, 13 Jun 2018 12:04:17 +0000 (12:04 +0000)

Trivial merge