Nyan nyan nyan nyan

Signed-off-by: scott <scott@ubuntu>

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

Change-Id: I9c617e0b155232392134f62ffaaf45f5c2690cea

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