| Chunk |
|---|
| Conflicting content |
|---|
*
* @hide
*/
<<<<<<< HEAD
private static final int PIVOT_EXPLICITLY_SET = 0x10000000;
=======
private int mOverscrollMode;
>>>>>>> 59a29f4a6ca7f6e177509f4c86a8ab968faf4f2c
/**
* The parent this view is attached to. |
| Solution content |
|---|
*
* @hide
*/
private static final int PIVOT_EXPLICITLY_SET = 0x10000000;
/**
* The parent this view is attached to. |
| File |
|---|
| View.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |