Fix merge fail 62/8462/1
authorGuillaume Zajac <guillaume.zajac@linux.intel.com>
Fri, 7 Jun 2013 09:11:41 +0000 (11:11 +0200)
committerwootak.jung <wootak.jung@samsung.com>
Tue, 20 Aug 2013 00:46:39 +0000 (09:46 +0900)
commit57643d86d45e5be0de0b63ac22f68ab185a16940
tree4181dd966f63c5b04d275c472252b822fc480773
parentce1b33a38b22b611569ca8c00b022e5b9089509c
Fix merge fail
src/sms.c