App sidebar (1/2)

Change-Id: I600a21fd780587ef84c8e1994adbaccc6098254d

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