Merge tags 'android-4.2.2_r1.2'

Conflicts:
	chips/Android.mk
	chips/res/drawable-hdpi/chip_background.9.png
	chips/res/drawable-hdpi/ic_contact_picture.png
	chips/res/drawable-mdpi/chip_background.9.png
	chips/res/drawable-mdpi/ic_contact_picture.png
	chips/res/drawable-xhdpi/chip_background.9.png
	chips/res/drawable-xhdpi/chip_background_invalid.9.png
	chips/res/drawable-xhdpi/chip_background_selected.9.png
	chips/res/drawable-xhdpi/ic_contact_picture.png
	chips/res/drawable/list_item_font_primary.xml
	chips/res/drawable/list_item_font_secondary.xml
	chips/res/values/dimen.xml
	chips/src/com/android/ex/chips/ChipsUtil.java
	chips/src/com/android/ex/chips/RecipientEntry.java

Signed-off-by: travp624 <travp624@gmail.com>