From: Sangho Park <sangho1206.park@samsung.com>
Date: Wed, 13 May 2015 06:26:56 +0000 (+0900)
Subject: Merge branch 'spin-develop' into tizen
X-Git-Tag: submit/tizen/20150602.060836~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=35eb64714feb7dc58affc0a8e9e74da4a8d20adc;p=platform%2Fadaptation%2Femulator%2Fsystem-plugin-emulator.git

Merge branch 'spin-develop' into tizen

Signed-off-by: Sangho Park <sangho1206.park@samsung.com>

Conflicts:
	AUTHORS
	LICENSE
	NOTICE
	filesystem/etc/inittab
	filesystem/etc/profile.d/proxy_setting.sh
	filesystem/etc/rc.d/rc.sysinit
	filesystem/usr/lib/systemd/system/emul-common-preinit.service
	filesystem/usr/lib/systemd/system/emul-setup-audio-volume.service
	filesystem/usr/lib/udev/rules.d/95-tizen-emulator.rules
	packaging/system-plugin-emulator.changes
	packaging/system-plugin-emulator.spec

Change-Id: I57283d0714e8fa7876b051d75f80c86818b53031
---

35eb64714feb7dc58affc0a8e9e74da4a8d20adc