unix end-of-line, @Override
Merge branch 'master' into android-1.5
cleanup

Conflicts:
	src/android/patches/JellyBeanSpanFixTextView.java
Merge branch 'master' into android-1.5