adjust

Change-Id: I8ccdb60f093db379f10b4977ea231b856cf03472
Revert "Settings: Added cpu info and memory info to About Phone Settings"

This reverts commit d31eb9d37d499649223945446f028c69f000d427.

Conflicts:
	res/values/strings.xml
	src/com/android/settings/DeviceInfoSettings.java

Change-Id: I1a1369806a7524e802cce7fa6a97a56d58e67eee
Show more Hardware Info in Device Settings

Conflicts:
	res/values/bk_strings.xml

Conflicts:
	res/xml/device_info_settings.xml
	src/com/android/settings/DeviceInfoSettings.java

Change-Id: I2127ac7561efe36e4beee6f8d422507471f9319f
adjust more hardware information