Projects >> frameworks_base_disabled >>af4da0e8b56add1d6ce87d57f370da97c44593b5

Chunk
Conflicting content 
            // tell the keyguard
            mKeyguardMediator.onSystemReady();
            android.os.SystemProperties.set("dev.bootcomplete", "1"); 
<<<<<<< HEAD
=======
            updateOrientationListener();
>>>>>>> 646860b2e8b57977fb2425075d88ad608ff2ffaf
        } catch (RemoteException e) {
            // Ignore
        }
Solution content 
            // tell the keyguard
            mKeyguardMediator.onSystemReady();
            android.os.SystemProperties.set("dev.bootcomplete", "1"); 
            updateOrientationListener();
        } catch (RemoteException e) {
            // Ignore
        }
File
PhoneWindowManager.java
Developer's decision
Version 2
Kind of conflict
Method invocation