Fixed the conflict merge
authorSunghyun Kwon <sh0701.kwon@samsung.com>
Mon, 15 Apr 2013 11:32:52 +0000 (20:32 +0900)
committerSunghyun Kwon <sh0701.kwon@samsung.com>
Mon, 15 Apr 2013 11:32:52 +0000 (20:32 +0900)
commit4297497be23aedd93bb4c88aed22ebcfa3b325b2
treec2f286609b6dac5061b0a1f40905377fe7394e99
parentf952a09030d7c055a586d52a768de8b28130bd23
parent347625674e289b0524fc64171d36ba1b6a8a51bd
Fixed the conflict merge
email-core/email-storage/email-storage.c
utilities/test-application/testapp-others.c