Projects >> android_frameworks_base >>6b592723c9a9fc816a8ab75c935e8cd20ff65a0e

Chunk
Conflicting content
         * large as the current screen will provide the user with a UI to
         * switch them in to screen size compatibility mode.

*/ <<<<<<< HEAD public static final int HONEYCOMB_MR2 = CUR_DEVELOPMENT; /** * Current version under development. */ public static final int ICE_CREAM_SANDWICH = CUR_DEVELOPMENT; ======= public static final int HONEYCOMB_MR2 = 13; >>>>>>> f51ded0f8f593d17af82946eb65c05fc04f688b4 } /** The type of build, like "user" or "eng". */
Solution content
         * large as the current screen will provide the user with a UI to
         * switch them in to screen size compatibility mode.

*/ public static final int HONEYCOMB_MR2 = 13; /** * Current version under development. */ public static final int ICE_CREAM_SANDWICH = CUR_DEVELOPMENT; } /** The type of build, like "user" or "eng". */
File
Build.java
Developer's decision
Combination
Kind of conflict
Attribute
Comment