Merge "modify manifest"
authorSehwan Park <sehwan@samsung.com>
Wed, 5 Dec 2012 02:42:33 +0000 (11:42 +0900)
committerGerrit Code Review <gerrit2@kim11>
Wed, 5 Dec 2012 02:42:33 +0000 (11:42 +0900)

Trivial merge