Merge commit 'c4f93305' into eclair-plus-aosp * commit 'c4f93305': Fix for DecimalFormatTest#test_formatToCharacterIteratorLjava_lang_Object