Merge "Add shape input mask feature (upstream svn rev.58621)"
authorSangjin Lee <lsj119@samsung.com>
Thu, 14 Apr 2011 07:28:40 +0000 (16:28 +0900)
committerGerrit Code Review <git@Maetan>
Thu, 14 Apr 2011 07:28:40 +0000 (16:28 +0900)

Trivial merge