Projects >> platform_frameworks_base >>db4c5f352d6eb8e248953ccff1dbecb1270af4c5

Chunk
Conflicting content 
                    LocalSocketAddress.Namespace.RESERVED);

            socket.connect(address);
<<<<<<< HEAD
=======

            mOutputStream = socket.getOutputStream();
            mCallbacks.onDaemonConnected();
>>>>>>> 7816eded417357561496df19dfa711be5586f3b0

            InputStream inputStream = socket.getInputStream();
Solution content 
                    LocalSocketAddress.Namespace.RESERVED);

            socket.connect(address);

            InputStream inputStream = socket.getInputStream();
            mOutputStream = socket.getOutputStream();
File
NativeDaemonConnector.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation