Merge "Placeholder properties as enums" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 13 Oct 2017 17:48:29 +0000 (17:48 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 13 Oct 2017 17:48:30 +0000 (17:48 +0000)

Trivial merge