resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp

Change-Id: Ie9b0166b0260ee7eea7bdd275e64f2714024bf1c
2011-01-26 11:10:29 -08:00
parent 7c55da5db5 2c1d0967ba
commit 7dbf0696ef
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/os/storage/IObbActionListener.java
+++ b/core/java/android/os/storage/IObbActionListener.java
@@ -113,7 +113,7 @@ public interface IObbActionListener extends IInterface {
                    _data.writeInt(nonce);
                    _data.writeInt(status);
                    mRemote.transact(Stub.TRANSACTION_onObbResult, _data, _reply,
-                            Binder.FLAG_ONEWAY);
+                            IBinder.FLAG_ONEWAY);
                    _reply.readException();
                } finally {
                    _reply.recycle();