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
projects / platform / adaptation / emulator / system-plugin-emulator.git / commit