unix end-of-line, @Override
cleanup

Conflicts:
	src/android/patches/JellyBeanSpanFixTextView.java