Initial commit
Merge branch 'master' of https://github.com/vipersaudio/viper4android_fx
Update to 2.3.0.1
Merge branch 'master' of https://github.com/vipersaudio/viper4android_fx
cleanup
Merge branch 'upstream' into cm-10.2

Conflicts:
	Android.mk
	AndroidManifest.xml
	android_4.x/assets/libv4a_fx_ics_NOVFP.so.jb
	assets/driver_ver.txt
	assets/libv4a_fx_ics_CortexA8.so.ics
	assets/libv4a_fx_ics_CortexA8.so.jb
	assets/libv4a_fx_ics_CortexA9.so.ics
	assets/libv4a_fx_ics_CortexA9.so.jb
	assets/libv4a_fx_ics_NOVFP.so
	assets/libv4a_fx_ics_NOVFP.so.ics
	assets/libv4a_fx_ics_NOVFP.so.jb
	assets/libv4a_fx_ics_VFP.so.ics
	assets/libv4a_fx_ics_VFP.so.jb
	libs/android-support-v13.jar
	lint.xml
	res/layout/equalizer.xml
	res/layout/equalizer_popup.xml
	res/layout/saveprofile.xml
	res/layout/top.xml
	res/values-ru/arrays.xml
	res/values-zh-rCN/arrays.xml
	res/values-zh-rTW/arrays.xml
	res/xml/bluetooth_preferences.xml
	res/xml/headset_preferences.xml
	res/xml/speaker_preferences.xml
	res/xml/usb_preferences.xml