Projects >> android-frameworks-base-with-remote-control-service >>ec892d1b048207c48b04193df38b6747d31468da

Chunk
Conflicting content 
         * 
         */
        public static final int GINGERBREAD = 9;
<<<<<<< HEAD

        /**
         * Next next version of Android.
         *
         * 
Applications targeting this or a later release will get these
         * new changes in behavior:

         * 
    
         * 
  •  The default theme for applications is now dark holographic:
         *      {@link android.R.style#Theme_Holo}.
         * 

         */
        public static final int HONEYCOMB = CUR_DEVELOPMENT;
=======
>>>>>>> 69a19fdbff6aff8875d87e27c9b1047d0a3f44c1
    }
    
    /** The type of build, like "user" or "eng". */
Solution content 
         * 
         */
        public static final int GINGERBREAD = 9;

        /**
         * Next next version of Android.
         *
         * 
Applications targeting this or a later release will get these
         * new changes in behavior:

         * 
    
         * 
  •  The default theme for applications is now dark holographic:
         *      {@link android.R.style#Theme_Holo}.
         * 

         */
        public static final int HONEYCOMB = CUR_DEVELOPMENT;
    }
    
    /** The type of build, like "user" or "eng". */
File
Build.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment