Merge "add manifest file"
authorTaeKyun Kim <tkq.kim@samsung.com>
Tue, 10 Nov 2015 02:24:06 +0000 (11:24 +0900)
committerGerrit Code Review <gerrit@s001>
Tue, 10 Nov 2015 02:24:06 +0000 (11:24 +0900)

Trivial merge