Merge commit '6e15a70c79c360f6870b06610f61a7d02cb29b2c' into eclair-mr2-plus-aosp * commit '6e15a70c79c360f6870b06610f61a7d02cb29b2c': Rename VCardTest.java to VCardImportTest.java.
Merge commit '6e15a70c79c360f6870b06610f61a7d02cb29b2c' into eclair-mr2-plus-aosp * commit '6e15a70c79c360f6870b06610f61a7d02cb29b2c': Rename VCardTest.java to VCardImportTest.java.