Projects >> platform_frameworks_base >>568628dc2cb92b3ec3a87cae9de3203fbdc5968c

Chunk
Conflicting content 
     * Max value used as a feature ID
     * @hide
     */
<<<<<<< HEAD
    public static final int FEATURE_MAX = FEATURE_CONTENT_TRANSITIONS;
=======
    public static final int FEATURE_MAX = FEATURE_SWIPE_TO_DISMISS;
>>>>>>> 2faf28cf85232d9eee0926c05c941c53381d4161

    /** Flag for setting the progress bar's visibility to VISIBLE */
    public static final int PROGRESS_VISIBILITY_ON = -1;
Solution content 
     * Max value used as a feature ID
     * @hide
     */
    public static final int FEATURE_MAX = FEATURE_CONTENT_TRANSITIONS;

    /** Flag for setting the progress bar's visibility to VISIBLE */
    public static final int PROGRESS_VISIBILITY_ON = -1;
File
Window.java
Developer's decision
Version 1
Kind of conflict
Attribute