| Chunk |
|---|
| Conflicting content |
|---|
int mNavigationIconHints = 0;
private Drawable mBackIcon, mBackLandIcon, mBackAltIcon, mBackAltLandIcon;
<<<<<<< HEAD
=======
>>>>>>> e5ed1406a544eb3891af66ee30165e13a30efbad
private DelegateViewHelper mDelegateHelper;
// workaround for LayoutTransitions leaving the nav buttons in a weird state (bug 5549288) |
| Solution content |
|---|
int mNavigationIconHints = 0;
private Drawable mBackIcon, mBackLandIcon, mBackAltIcon, mBackAltLandIcon;
private DelegateViewHelper mDelegateHelper;
// workaround for LayoutTransitions leaving the nav buttons in a weird state (bug 5549288) |
| File |
|---|
| NavigationBarView.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |