adjust last commit
RAM bar (2/2)

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml
	src/com/android/settings/Settings.java
name change