Ram bar (1/2)

Change-Id: I19003c1bbcf3226414e9e3168418afc912ae850e

Conflicts:
	core/java/android/provider/Settings.java