From: Sooyoung Ha <yoosah.ha@samsung.com>
Date: Thu, 17 Jan 2013 12:30:33 +0000 (+0900)
Subject: Merge branch 'master' into tizen_2.0
X-Git-Tag: accepted/tizen/common/20150529.082310~8^2~11^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f90b66d9a772aa8dccf7d3e8c1da3dd78ebdfd4f;p=platform%2Fadaptation%2Femulator%2Fvmodem-daemon-emulator.git

Merge branch 'master' into tizen_2.0

Conflicts:
	packaging/vmodemd-emul.spec
---

f90b66d9a772aa8dccf7d3e8c1da3dd78ebdfd4f