Merge to f6c4dba2d30ddba41ccfd6d9d2be2729ea496902
Merge branch 'original'

Conflicts:
	core/java/android/widget/AbsListView.java
	core/java/android/widget/AdapterView.java
	core/java/android/widget/AlphabetIndexer.java
	docs/html/guide/guide_toc.cs
	docs/html/guide/topics/ui/notifiers/notifications.jd
	docs/html/index.jd
	docs/html/resources/resources_toc.cs
	docs/html/sdk/sdk_toc.cs