| Chunk |
|---|
| Conflicting content |
|---|
}
}
<<<<<<< HEAD
=======
// Use NANP in default when there's no information about locale.
>>>>>>> 0de3cc9b5ee8947c87dcd3bc55d2b774d8479a64
final int formattingType = VCardUtils.getPhoneNumberFormat(mVCardType);
formattedNumber = PhoneNumberUtils.formatNumber(builder.toString(), formattingType);
} |
| Solution content |
|---|
}
}
final int formattingType = VCardUtils.getPhoneNumberFormat(mVCardType);
formattedNumber = PhoneNumberUtils.formatNumber(builder.toString(), formattingType);
} |
| File |
|---|
| VCardEntry.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |