merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:14:53 +0000 (01:14 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:14:53 +0000 (01:14 +0900)
commit1055e8ad7ac35cf2a7f2cbfe458ef5ff29ba94ad
treee0a411dd198d01a768bb689241d698f917cbcd8a
parentce3b206f66a619a00020d085c11541243b65f0aa
merge with master
mapi/msg_message.cpp
mapi/msg_mms.cpp
plugin/sms_plugin/SmsPluginTransport.cpp
proxy/MsgHandleControl.cpp