Merge "Re-commit by conflict-Add clear canvas logic before draw TextObject in DrawEmp...
authorwonyoung12.lee <wonyoung12.lee@samsung.com>
Tue, 11 Jun 2013 04:48:54 +0000 (13:48 +0900)
committerGerrit Code Review <gerrit2@kim11>
Tue, 11 Jun 2013 04:48:54 +0000 (13:48 +0900)

Trivial merge