Merge branch 'sdk'
authorSangkoo Kim <sangkoo.kim@samsung.com>
Wed, 5 Dec 2012 04:17:16 +0000 (13:17 +0900)
committerSangkoo Kim <sangkoo.kim@samsung.com>
Wed, 5 Dec 2012 04:17:16 +0000 (13:17 +0900)
commit5384fc2aa5e52f8a0568889d3d328e0ee1a709cc
tree51b10a60c6cc9d2547e2e44ddbdd51a58afdf927
parentda828b62f7124b0fa4b922e3c4010aeb687020ae
parent259a627619475aa948e193960880d673765c1869
Merge branch 'sdk'

Conflicts:
packaging/msg-service.spec

Change-Id: I11ac88c1fdbc442b68122d526ead21643a031bb0
packaging/msg-service.spec