Merge "Multi-line layout." into devel/master
authorKimmo Hoikka <kimmo.hoikka@samsung.com>
Wed, 22 Jul 2015 12:59:07 +0000 (05:59 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 22 Jul 2015 12:59:07 +0000 (05:59 -0700)

Trivial merge