Google bug report on a custom rom? Bye bye...

Conflicts:
	res/xml/development_prefs.xml