Revert to f6c4dba2d30ddba41ccfd6d9d2be2729ea496902
Merge branch 'original'

Conflicts:
	core/java/android/widget/AbsListView.java
	core/java/android/widget/AlphabetIndexer.java
Add translate.