| Chunk |
|---|
| Conflicting content |
|---|
private QueryHandler mQueryHandler;
private Drawable mBadgeBackground;
private Drawable mNoBadgeBackground;
<<<<<<< HEAD
private Drawable mDefaultAvatar;
=======
private int mSelectedContactsAppTabIndex = -1;
>>>>>>> c61c98fdba0f705e29d6d1e9fc81e33d4cb07ff9
protected String[] mExcludeMimes = null;
|
| Solution content |
|---|
private Drawable mBadgeBackground;
private Drawable mNoBadgeBackground;
private Drawable mDefaultAvatar;
protected String[] mExcludeMimes = null;
private QueryHandler mQueryHandler; |
| File |
|---|
| QuickContactBadge.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |