Projects >> platform_frameworks_base >>4201be08a1cb1358e7ee30f81927b7c11f477ea3

Chunk
Conflicting content 
                || !Objects.equal(uniqueId, other.uniqueId)
                || width != other.width
                || height != other.height
<<<<<<< HEAD
                || modeId != other.modeId
                || defaultModeId != other.defaultModeId
                || !Arrays.equals(supportedModes, other.supportedModes)
=======
                || refreshRate != other.refreshRate
                || !Arrays.equals(supportedRefreshRates, other.supportedRefreshRates)
>>>>>>> 37d0c94f7a4a1e2ca31b5cbc269222ded7495ca0
                || densityDpi != other.densityDpi
                || xDpi != other.xDpi
                || yDpi != other.yDpi
Solution content 
                || !Objects.equal(uniqueId, other.uniqueId)
                || width != other.width
                || height != other.height
                || modeId != other.modeId
                || defaultModeId != other.defaultModeId
                || !Arrays.equals(supportedModes, other.supportedModes)
                || densityDpi != other.densityDpi
                || xDpi != other.xDpi
                || yDpi != other.yDpi
File
DisplayDeviceInfo.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Variable