Add identicons
Other commits:
frameworks_base
packages_providers_ContactsProvider
Conflicts:
	core/java/android/provider/Settings.java