Projects >> android_packages_apps_Trebuchet >>02b3a8ca1f9dac40677dcdee2fc88307b99cc15d

Chunk
Conflicting content 
            }
        }

<<<<<<< HEAD
=======
        if (mScroller.isFinished() && mChildCountOnLastMeasure != getChildCount() &&
                !mDeferringForDelete) {
            setCurrentPage(getNextPage());
        }
        mChildCountOnLastMeasure = getChildCount();

        updateScrollingIndicatorPosition();

>>>>>>> 96d30a165185dc59617e181314f4d22634e22952
        if (childCount > 0) {
            final int index = isLayoutRtl() ? 0 : childCount - 1;
            mMaxScrollX = getChildOffset(index) - getRelativeChildOffset(index);
Solution content 
            }
        }

        if (mScroller.isFinished() && mChildCountOnLastMeasure != getChildCount() &&
                !mDeferringForDelete) {
            setCurrentPage(getNextPage());
        }
        mChildCountOnLastMeasure = getChildCount();

        if (childCount > 0) {
            final int index = isLayoutRtl() ? 0 : childCount - 1;
            mMaxScrollX = getChildOffset(index) - getRelativeChildOffset(index);
File
PagedView.java
Developer's decision
Combination
Kind of conflict
Attribute
If statement
Method invocation