Projects >> android-frameworks-base-with-remote-control-service >>7dbf0696ef37097f2bcec058f876f7f4ba63d357

Chunk
Conflicting content 
                    _data.writeInt(nonce);
                    _data.writeInt(status);
                    mRemote.transact(Stub.TRANSACTION_onObbResult, _data, _reply,
<<<<<<< HEAD
                            Binder.FLAG_ONEWAY);
=======
                            android.os.IBinder.FLAG_ONEWAY);
>>>>>>> 2c1d0967ba23f7e806e338bc74148bed93823706
                    _reply.readException();
                } finally {
                    _reply.recycle();
Solution content 
                    _data.writeInt(nonce);
                    _data.writeInt(status);
                    mRemote.transact(Stub.TRANSACTION_onObbResult, _data, _reply,
                            IBinder.FLAG_ONEWAY);
                    _reply.readException();
                } finally {
                    _reply.recycle();
File
IObbActionListener.java
Developer's decision
Manual
Kind of conflict
Other