Projects >> platform_frameworks_base >>ee20cbf30a2ef92128ed4eac562d6ee81f55d61f

Chunk
Conflicting content 
                                    nativeGetContentMinPrefWidth())));
                }
            } else {
<<<<<<< HEAD
                width = Math.max(w, mViewportWidth);
=======
                width = textwrapWidth;
>>>>>>> c8cab72521781091e87049861c4b25fb19197ea4
            }
        }
        nativeSetSize(width, width == w ? h : Math.round((float) width * h / w),
Solution content 
                                    nativeGetContentMinPrefWidth())));
                }
            } else {
                width = Math.max(w, mViewportWidth);
            }
        }
        nativeSetSize(width, width == w ? h : Math.round((float) width * h / w),
File
WebViewCore.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable