Projects >> frameworks_base_disabled >>fd9e6acd8685ff8e4ea5eb5bb08b3a3f15ff91ee

Chunk
Conflicting content 
        public static final int GINGERBREAD = 9;
        
        /**
<<<<<<< HEAD
         * Almost newest version of Android, version 2.3.3.
         */
        public static final int GINGERBREAD_MR1 = 10;

        /**
         * Newest version of Android, version 3.0.
         *
         * 
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}.
         * 
  •  The activity lifecycle has changed slightly as per
         * {@link android.app.Activity}.
         * 
  •  When an application requires a permission to access one of
         * its components (activity, receiver, service, provider), this
         * permission is no longer enforced when the application wants to
         * access its own component.  This means it can require a permission
         * on a component that it does not itself hold and still access that
         * component.
         * 

         */
        public static final int HONEYCOMB = 11;
=======
         * Newest version of Android, version 2.3.3.
         */
        public static final int GINGERBREAD_MR1 = 10;
>>>>>>> 11576102a9794ef964a08bc372dc09803f58997a
    }
    
    /** The type of build, like "user" or "eng". */
Solution content 
        public static final int GINGERBREAD = 9;
        
        /**
         * Almost newest version of Android, version 2.3.3.
         */
        public static final int GINGERBREAD_MR1 = 10;

        /**
         * Newest version of Android, version 3.0.
         *
         * 
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}.
         * 
  •  The activity lifecycle has changed slightly as per
         * {@link android.app.Activity}.
         * 
  •  When an application requires a permission to access one of
         * its components (activity, receiver, service, provider), this
         * permission is no longer enforced when the application wants to
         * access its own component.  This means it can require a permission
         * on a component that it does not itself hold and still access that
         * component.
         * 

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