About RB: Goodbye twitter, Welcome Gravatar.
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1

Conflicts:
	res/values/attrs.xml
	src/com/android/settings/widgets/DeveloperPreference.java