Merge commit 'd2cd9467b876777d512911fadeb948e58b9de257' into eclair-plus-aosp * commit 'd2cd9467b876777d512911fadeb948e58b9de257': Suppress warning around old vcard code.
Merge commit 'd2cd9467b876777d512911fadeb948e58b9de257' into eclair-plus-aosp * commit 'd2cd9467b876777d512911fadeb948e58b9de257': Suppress warning around old vcard code.