Add Omni Version

Conflicts:
	src/com/android/settings/DeviceInfoSettings.java

Change-Id: Ia21c3d0d87c6a51a5e83c54017101e654d8cb0d1