unix end-of-line, @Override
unix end-of-line, @Override
Merge branch 'master' into ice-cream-sandwich
cleanup
cleanup

Conflicts:
	src/android/patches/JellyBeanSpanFixTextView.java
Merge branch 'master' into ice-cream-sandwich